Skip to content

Commit

Permalink
Merge pull request #1198 from silverstripe-rebelalliance/open8231
Browse files Browse the repository at this point in the history
ENHANCEMENT: fixed styling bug with the text in the file upload drop are...
  • Loading branch information
chillu committed Mar 20, 2013
2 parents 0a13d29 + 231439e commit 42b19cb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
8 changes: 4 additions & 4 deletions css/AssetUploadField.css

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

15 changes: 8 additions & 7 deletions scss/AssetUploadField.scss
Expand Up @@ -8,7 +8,7 @@

// Temporary. To be hidden and replaced with javascript tooltip
.ss-uploadfield-view-allowed-extensions{
padding-top:20px;
padding-top:5px;
clear:both;
max-width:750px;
display:block;
Expand Down Expand Up @@ -319,7 +319,7 @@ body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fie
height: 54px;
width: 360px;
float: left;
text-align: center;
text-align: left;

&.active{
&.hover{
Expand All @@ -329,14 +329,14 @@ body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fie
div {
color:lighten($color-text, 10%);
text-shadow: 0px 1px 0px #fff;
background: url('../images/upload.png') 0 12px no-repeat;
background: url('../images/upload.png') 0 10px no-repeat;
z-index:1;
padding: 20px 38px 0;
padding: 6px 48px 0;
line-height: 25px;
font-size: 20px;
font-weight: bold;
display: inline-block;
margin:0 auto;
margin-left: 83px;
span {
display: block;
font-size: 12px;
Expand All @@ -350,8 +350,9 @@ body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fie
overflow:hidden;

div{
background-position:0 13px;
padding-top:22px;
background-position:0 11px;
padding-top:21px;
margin-left: 33px;
span{
height:38px;
font-size:18px;
Expand Down

0 comments on commit 42b19cb

Please sign in to comment.