From 46a5ee7d1de7fecd574b091377abad5a56326126 Mon Sep 17 00:00:00 2001 From: Naomi Guyer Date: Fri, 25 Jul 2014 16:15:49 +1200 Subject: [PATCH] CSS: Fix upload field display for preview open --- css/UploadField.css | 2 +- scss/UploadField.scss | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/css/UploadField.css b/css/UploadField.css index d4df94d49..1f5409183 100644 --- a/css/UploadField.css +++ b/css/UploadField.css @@ -11,7 +11,7 @@ Used in side panels and action tabs */ .ss-uploadfield .clear { clear: both; } -.ss-uploadfield .middleColumn { width: 510px; padding: 0; background: #fff; border: 1px solid #b3b3b3; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #efefef), color-stop(10%, #ffffff), color-stop(90%, #ffffff), color-stop(100%, #efefef)); background-image: -webkit-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -moz-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -o-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); } +.ss-uploadfield .middleColumn { min-width: 510px; max-width: 600px; width: 100%; margin-left: 0; clear: both; padding: 0; background: #fff; border: 1px solid #b3b3b3; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #efefef), color-stop(10%, #ffffff), color-stop(90%, #ffffff), color-stop(100%, #efefef)); background-image: -webkit-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -moz-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -o-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); } .ss-uploadfield .ss-uploadfield-item { margin: 0; padding: 15px; overflow: auto; } .ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-preview { height: 60px; line-height: 60px; width: 80px; text-align: center; font-weight: bold; float: left; overflow: hidden; } .ss-uploadfield .ss-uploadfield-item .ss-uploadfield-item-preview.ss-uploadfield-dropzone { -webkit-box-shadow: gray 0 0 4px 0 inset; -moz-box-shadow: gray 0 0 4px 0 inset; box-shadow: gray 0 0 4px 0 inset; border: 2px dashed gray; background: #d0d3d5; display: none; margin-right: 15px; } diff --git a/scss/UploadField.scss b/scss/UploadField.scss index 57fb1098e..8df2241b1 100644 --- a/scss/UploadField.scss +++ b/scss/UploadField.scss @@ -13,7 +13,11 @@ .middleColumn { // TODO .middleColumn styling should probably be theme specific (eg cms ui will look different than blackcandy) // so we should move this style into the cms and black candy files - width: 510px; + min-width: 510px; + max-width: 600px; // Capped width. 600px is about the average size of a preview split view + width:100%; + margin-left:0; + clear:both; padding: 0; background: #fff; border: 1px solid lighten($color-medium-separator, 20%);