Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7395 from Stanford-Online/kluo/fix-modal-display-issue

Browse Source 
Fix modal css to be hidden immediately
This commit is contained in:
Chris
2015-06-17 08:54:06 -04:00
parent 7dd7e6525b 8d56fe3bc1
commit 5ebe91e18b
2 changed files with 51 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
cms/static/sass/_base.scss
View File

@@ -666,67 +666,63 @@ hr.divider {
} }
} }
// +JS Dependent // lean/simple modal window
// ==================== .content-modal {
body.js { @include border-bottom-radius(2px);
@include box-sizing(border-box);
position: relative;
display: none;
width: 700px;
padding: ($baseline);
border: 1px solid $gray-d1;
background: $white;
box-shadow: 0 2px 4px $shadow-d1;
overflow: hidden;
// lean/simple modal window .action-modal-close {
.content-modal { @include transition(top $tmg-f3 ease-in-out 0s);
@include border-bottom-radius(2px); @include border-bottom-radius(3px);
@include box-sizing(border-box); position: absolute;
box-shadow: 0 2px 4px $shadow-d1; top: -3px;
position: relative; right: $baseline;
display: none; padding: ($baseline/4) ($baseline/2) 0 ($baseline/2);
width: 700px; background: $gray-l3;
overflow: hidden; text-align: center;
border: 1px solid $gray-d1;
padding: ($baseline);
background: $white;
.action-modal-close { .label {
@include transition(top $tmg-f3 ease-in-out 0s); @extend %cont-text-sr;
@include border-bottom-radius(3px);
position: absolute;
top: -3px;
right: $baseline;
padding: ($baseline/4) ($baseline/2) 0 ($baseline/2);
background: $gray-l3;
text-align: center;
.label {
@extend %cont-text-sr;
}
.icon {
@extend %t-action1;
color: $white;
}
&:hover {
background: $blue;
top: 0;
}
} }
img { .icon {
@include box-sizing(border-box); @extend %t-action1;
width: 100%; color: $white;
overflow-y: scroll;
padding: ($baseline/10);
border: 1px solid $gray-l4;
} }
.title { &:hover {
@extend %t-title5; top: 0;
@extend %t-strong; background: $blue;
margin: 0 0 ($baseline/2) 0;
color: $gray-d3;
}
.description {
@extend %t-copy-sub2;
margin-top: ($baseline/2);
color: $gray-l1;
} }
} }
img {
@include box-sizing(border-box);
width: 100%;
overflow-y: scroll;
padding: ($baseline/10);
border: 1px solid $gray-l4;
}
.title {
@extend %t-title5;
@extend %t-strong;
margin: 0 0 ($baseline/2) 0;
color: $gray-d3;
}
.description {
@extend %t-copy-sub2;
margin-top: ($baseline/2);
color: $gray-l1;
}
} }

7
common/static/css/vendor/normalize.css vendored
View File

@@ -405,10 +405,3 @@ table {
border-spacing: 0; border-spacing: 0;
} }
/**
* Hide staticpage preview on load (Studio).
*/
#preview-lms-staticpages {
display: none;
}