From 82dc98bbc02565fd5423702e476f5b4dfafed360 Mon Sep 17 00:00:00 2001 From: Jeremy Bridson Date: Tue, 19 Feb 2013 09:21:49 +1300 Subject: [PATCH 1/2] ENHANCEMENT: fixed styling bug with the text in the file upload drop area and moved allowed extensions up a tad --- css/AssetUploadField.css | 6 +++--- scss/AssetUploadField.scss | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/css/AssetUploadField.css b/css/AssetUploadField.css index 369a3c5ca8a..4b502284419 100644 --- a/css/AssetUploadField.css +++ b/css/AssetUploadField.css @@ -10,7 +10,7 @@ /*Mixin used to generate slightly smaller text and forms Used in side panels and action tabs */ -.ss-uploadfield-view-allowed-extensions { padding-top: 20px; clear: both; max-width: 750px; display: block; } +.ss-uploadfield-view-allowed-extensions { padding-top: 5px; clear: both; max-width: 750px; display: block; } .ss-uploadfield-view-allowed-extensions .toggle { font-style: normal; font-size: 12px; } #AssetUploadField { border-bottom: 0; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } @@ -75,9 +75,9 @@ body.cms.ss-uploadfield-edit-iframe .fieldholder-small label, .composite.ss-asse .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-fromcomputer .btn-icon-drive-upload-large { background: url(../images/drive-upload-large.png) no-repeat 0px -4px; width: 32px; height: 32px; margin-top: -12px; } .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-uploador { float: left; font-weight: bold; font-size: 22px; padding: 0 20px; line-height: 70px; margin-top: 4px; display: none; } .ss-insert-media .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-uploador { font-size: 18px; margin-top: 0; } -.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone { margin-top: 9px; -webkit-border-radius: 13px; -moz-border-radius: 13px; -ms-border-radius: 13px; -o-border-radius: 13px; border-radius: 13px; -webkit-box-shadow: rgba(128, 128, 128, 0.4) 0 0 4px 0 inset, 0 1px 0 #fafafa; -moz-box-shadow: rgba(128, 128, 128, 0.4) 0 0 4px 0 inset, 0 1px 0 #fafafa; box-shadow: rgba(128, 128, 128, 0.4) 0 0 4px 0 inset, 0 1px 0 #fafafa; border: 2px dashed gray; background: #d4dbe0; display: none; height: 54px; width: 360px; float: left; text-align: center; } +.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone { margin-top: 9px; -webkit-border-radius: 13px; -moz-border-radius: 13px; -ms-border-radius: 13px; -o-border-radius: 13px; border-radius: 13px; -webkit-box-shadow: rgba(128, 128, 128, 0.4) 0 0 4px 0 inset, 0 1px 0 #fafafa; -moz-box-shadow: rgba(128, 128, 128, 0.4) 0 0 4px 0 inset, 0 1px 0 #fafafa; box-shadow: rgba(128, 128, 128, 0.4) 0 0 4px 0 inset, 0 1px 0 #fafafa; border: 2px dashed gray; background: #d4dbe0; display: none; height: 54px; width: 360px; float: left; text-align: left; } .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone.active.hover { -webkit-box-shadow: rgba(255, 255, 255, 0.6) 0 0 3px 2px inset; -moz-box-shadow: rgba(255, 255, 255, 0.6) 0 0 3px 2px inset; box-shadow: rgba(255, 255, 255, 0.6) 0 0 3px 2px inset; } -.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone div { color: #5e5e5e; text-shadow: 0px 1px 0px #fff; background: url("../images/upload.png") 0 12px no-repeat; z-index: 1; padding: 20px 38px 0; line-height: 25px; font-size: 20px; font-weight: bold; display: inline-block; margin: 0 auto; } +.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone div { color: #5e5e5e; text-shadow: 0px 1px 0px #fff; background: url("../images/upload.png") 0 10px no-repeat; z-index: 1; padding: 6px 48px 0; line-height: 25px; font-size: 20px; font-weight: bold; display: inline-block; margin-left: 83px; } .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone div span { display: block; font-size: 12px; z-index: -1; margin-top: -3px; } .ss-insert-media .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone { height: 54px; width: 277px; overflow: hidden; } .ss-insert-media .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone div { background-position: 0 13px; padding-top: 22px; } diff --git a/scss/AssetUploadField.scss b/scss/AssetUploadField.scss index 87514269c1b..fba66245a00 100644 --- a/scss/AssetUploadField.scss +++ b/scss/AssetUploadField.scss @@ -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; @@ -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{ @@ -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; From 231439ef9bc8b0cc903d14c0030a4d285260ce1a Mon Sep 17 00:00:00 2001 From: Jeremy Bridson Date: Tue, 19 Feb 2013 09:36:57 +1300 Subject: [PATCH 2/2] MINOR:forgot to add the fix to the insert media upload field - styles from files section were breaking it. --- css/AssetUploadField.css | 2 +- scss/AssetUploadField.scss | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/css/AssetUploadField.css b/css/AssetUploadField.css index 4b502284419..dcc8df2521a 100644 --- a/css/AssetUploadField.css +++ b/css/AssetUploadField.css @@ -80,5 +80,5 @@ body.cms.ss-uploadfield-edit-iframe .fieldholder-small label, .composite.ss-asse .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone div { color: #5e5e5e; text-shadow: 0px 1px 0px #fff; background: url("../images/upload.png") 0 10px no-repeat; z-index: 1; padding: 6px 48px 0; line-height: 25px; font-size: 20px; font-weight: bold; display: inline-block; margin-left: 83px; } .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone div span { display: block; font-size: 12px; z-index: -1; margin-top: -3px; } .ss-insert-media .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone { height: 54px; width: 277px; overflow: hidden; } -.ss-insert-media .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone div { background-position: 0 13px; padding-top: 22px; } +.ss-insert-media .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone div { background-position: 0 11px; padding-top: 21px; margin-left: 33px; } .ss-insert-media .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-dropzone div span { height: 38px; font-size: 18px; line-height: 18px; } diff --git a/scss/AssetUploadField.scss b/scss/AssetUploadField.scss index fba66245a00..c66b4e32b24 100644 --- a/scss/AssetUploadField.scss +++ b/scss/AssetUploadField.scss @@ -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;