Skip to content

Commit

Permalink
BUGFIXES: Fixes #7003
Browse files Browse the repository at this point in the history
  • Loading branch information
adrexia committed Apr 30, 2012
1 parent 5e7e823 commit 61c18c5
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 16 deletions.
1 change: 1 addition & 0 deletions admin/scss/ie7.scss
Expand Up @@ -27,6 +27,7 @@ html {
}
}


.ss-uploadfield-edit-iframe{
.field {
&.treedropdown{
Expand Down
4 changes: 3 additions & 1 deletion css/AssetUploadField.css

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

23 changes: 11 additions & 12 deletions javascript/UploadField.js
Expand Up @@ -239,23 +239,22 @@
var iframe = this.find('iframe'), padding = 32;
var h = iframe.contents().find('form').height() + padding;

/*Set options for open edit view based on browsers*/
if($.browser.msie && $.browser.version.slice(0,3) == "8.0"){
//set content background, and overflow to auto for IE8
iframe.contents().find('body').css({'overflow':'auto','background-color':'#E2E2E2'});
}else if($.browser.msie && $.browser.version.slice(0,3) == "7.0"){
//set content height and background color
iframe.contents().find('body').css({'height':(h-padding),'background-color':'#E2E2E2'});
}else{
//set content height for real browsers
iframe.contents().find('body').css({'height':h-padding});
/* Set height of body except in IE8. Setting this in IE8 breaks the
dropdown */
if(!$.browser.msie && $.browser.version.slice(0,3) != "8.0"){
iframe.contents().find('body').css({'height':(h-padding)});
}

// Set iframe to match its contents height
iframe.height(h);
// set container to match the same height

// set container to match the same height
iframe.contents().find('body form').css({'width':'98%'});

iframe.parent().height(h+2);
iframe.contents().find('body form').css({'width':'98%'});


},
toggleEditForm: function() {
if(this.height() === 0) {
Expand Down
7 changes: 5 additions & 2 deletions scss/AssetUploadField.scss
Expand Up @@ -19,6 +19,10 @@ body.cms.ss-uploadfield-edit-iframe {
}
}

.ss-uploadfield-edit-iframe {
background: #E2E2E2;
}

.ss-assetuploadfield {
h3 {
border-bottom: 1px solid $color-shadow-light;
Expand All @@ -40,8 +44,7 @@ body.cms.ss-uploadfield-edit-iframe {
.ss-uploadfield-item {
border: 1px solid lighten($color-medium-separator, 20%);
@include border-radius(5px);
@include background-clip(padding-box);
background: #E2E2E2;
@include background-clip(padding-box);
margin: 0 0 5px;
padding: 0;
overflow: hidden;
Expand Down
1 change: 0 additions & 1 deletion scss/TreeDropdownField.scss
Expand Up @@ -30,7 +30,6 @@ div.TreeDropdownField {
border: 1px solid #aaa;
border-top: none;
margin: 1px 0 0 -1px; /* account for border on container div */
//height: 200px;
max-height:200px;
background-color: #fff;
z-index: 50;
Expand Down

0 comments on commit 61c18c5

Please sign in to comment.