Skip to content
This repository
Browse code

MINOR Moved AssetUploadField iframe margins into iframe body itself t…

…o avoid width conflicts, override default .cms overflow behaviour to ensure the iframe content as a whole stays scrollable (fixes #7003)
  • Loading branch information...
commit 6d423fe9ee741b0334bece875a58af17517c7307 1 parent 3ef3a6d
Ingo Schommer authored March 27, 2012
4  css/AssetUploadField.css
@@ -6,6 +6,8 @@
6 6
 /** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */
7 7
 #AssetUploadField { border-bottom: 0; -moz-box-shadow: none; -webkit-box-shadow: none; -o-box-shadow: none; box-shadow: none; }
8 8
 
  9
+body.cms.ss-uploadfield-edit-iframe { padding: 16px; overflow: auto; }
  10
+
9 11
 .ss-assetuploadfield h3 { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -o-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); margin: 0 0 8px; padding: 0 0 7px; clear: both; }
10 12
 .ss-assetuploadfield .field { border-bottom: 0; }
11 13
 .ss-assetuploadfield .ss-uploadfield-files { margin: 0; padding: 0; }
@@ -30,7 +32,7 @@
30 32
 .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-cancel { position: absolute; top: 7px; right: 7px; }
31 33
 .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-cancel button { display: block; overflow: hidden; text-indent: -9999px; padding: 0; margin: 0; border: 0; width: 16px; height: 16px; cursor: pointer; -moz-box-shadow: none; -webkit-box-shadow: none; -o-box-shadow: none; box-shadow: none; }
32 34
 .ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform { /* don't use display none, for it will break jQuery('iframe').contents().height() */ height: 0; overflow: hidden; clear: both; }
33  
-.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform iframe { margin: 16px; width: 100%; }
  35
+.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform iframe { width: 100%; }
34 36
 .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-info { float: left; margin: 19px 0 0; }
35 37
 .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-fromcomputer { position: relative; overflow: hidden; display: block; margin: 0 10px 0 0; }
36 38
 .ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-uploador { float: left; font-weight: bold; font-size: 22px; padding: 0 20px; line-height: 70px; display: none; }
6  scss/AssetUploadField.scss
@@ -8,6 +8,11 @@
8 8
 	@include box-shadow(none);
9 9
 }
10 10
 
  11
+body.cms.ss-uploadfield-edit-iframe {
  12
+	padding: $grid-x*2;
  13
+	overflow: auto;
  14
+}
  15
+
11 16
 .ss-assetuploadfield {
12 17
 	h3 {
13 18
 		border-bottom: 1px solid $color-shadow-light;
@@ -162,7 +167,6 @@
162 167
 			clear: both;
163 168
 
164 169
 			iframe {
165  
-				margin: $grid-x*2;
166 170
 				width: 100%;
167 171
 			}
168 172
 		}

0 notes on commit 6d423fe

Please sign in to comment.
Something went wrong with that request. Please try again.