Skip to content

Commit

Permalink
BUG: Display of AssetUpload upload fields
Browse files Browse the repository at this point in the history
* Replaced file upload icon
* Fixed padding
* Replaced width of droparea with min-width
  • Loading branch information
Naomi Guyer committed May 25, 2013
1 parent 9273df1 commit 8235afc
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 17 deletions.
14 changes: 7 additions & 7 deletions css/AssetUploadField.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added images/drive-upload-white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 12 additions & 10 deletions scss/AssetUploadField.scss
Original file line number Diff line number Diff line change
Expand Up @@ -274,14 +274,14 @@ body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fie

.ss-uploadfield-item-info {
float: left;
margin: 10px 0 0;
margin: 25px 0 0;
.ss-insert-media &{
margin: 10px 0px 0 20px;
}
label{
font-size: 18px;
line-height: 30px;
padding: 8px 16px;
padding: 0px 16px;
margin-right:0px;
}
}
Expand All @@ -290,7 +290,7 @@ body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fie
overflow: hidden;
display: block;
.btn-icon-drive-upload-large {
background: url(../images/drive-upload-large.png) no-repeat 0px -4px;
background: url(../images/drive-upload-white.png) no-repeat 0px 0px;
width:32px;
height:32px;
margin-top:-12px;
Expand All @@ -302,22 +302,23 @@ body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fie
font-size: 22px;
padding: 0 20px;
line-height: 70px;
margin-top:4px;
margin-top:10px;
display: none;
.ss-insert-media &{
font-size: 18px;
margin-top: 0;
font-size: 18px;
margin-top: -5px;
}
}
.ss-uploadfield-dropzone {
margin-top:9px;
padding: 8px 0;
@include border-radius(13px);
@include box-shadow(rgba($color-medium-separator, 0.4) 0 0 4px 0 inset, 0 1px 0 #FAFAFA);
border: 2px dashed $color-medium-separator;
background: lighten($color-base,12%);
display: none;
height: 54px;
width: 360px;
min-width: 280px;
float: left;
text-align: center;

Expand Down Expand Up @@ -345,10 +346,11 @@ body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fie
}
.ss-insert-media &{
height: 54px;
width: 277px; //Design has these smaller than main upload area
min-width: 250px; //Design has these smaller than main upload area
overflow:hidden;

div{
padding:0;
margin-top:2px;
div{
background-position:0 11px;
padding-top:21px;
margin-left: 33px;
Expand Down

0 comments on commit 8235afc

Please sign in to comment.