tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Enhancement Fix height for modal in IE10

Browse Source 
Enhancement Remove link color specific to header
Enhancement Close panel class renamed, as it is not always top right
This commit is contained in:
Paul Clarke 2016-11-21 15:37:05 +13:00 committed by Christopher Joe
parent 43917edc97
commit 35e313de17
7 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
admin/client/dist/styles/bundle.css vendored
View File

@ -8781,10 +8781,6 @@ fieldset{
display:none;
}
.field .dropdown select{
margin-top:8px;
}
.field .chosen-container-active .chosen-single{
border:1px solid #9a9a9a;
}
@ -9381,10 +9377,6 @@ body.cms{
background-color:#f0f2f4;
}
.cms-content-header a{
color:#0071c4;
}
.cms-content-header .backlink span.btn-icon-back{
height:16px;
}
@ -15173,7 +15165,7 @@ button.close{
padding:.3846rem .7692rem;
}
.btn--top-right{
.btn--close-panel{
float:right;
right:0;
margin-right:5px;
@ -15181,7 +15173,7 @@ button.close{
position:absolute;
}
.btn--top-right:before{
.btn--close-panel:before{
color:#66727d;
}
@ -15456,10 +15448,6 @@ div.grid-field__sort-field+.form__fieldgroup-item{
margin-top:-1px;
}
.message-box--panel-top{
margin-right:1.8462rem;
}
.preview{
position:relative;
background-color:#f6f7f8;
@ -15934,9 +15922,14 @@ input.checkbox,input.radio,input[type=checkbox],input[type=radio]{
}
}
.modal-dialog{
height:calc(100% - 53px);
}
.modal-content{
overflow:hidden;
border:0;
height:100%;
}
.modal-header{

2
admin/client/src/components/FormAction/FormAction.scss
View File

@ -219,7 +219,7 @@ button.close {
}
// Apply to things like panel close btn
.btn--top-right {
.btn--close-panel {
float: right;
right: 0;
margin-right: 5px;

4
admin/client/src/components/FormAlert/FormAlert.scss
View File

@ -2,7 +2,3 @@
padding: 0;
margin-top: -1px;
}
.message-box--panel-top {
margin-right: $spacer * 1.5;
}

5
admin/client/src/components/Modal/Modal.scss
View File

@ -1,7 +1,12 @@
// Based on bootstrap modal
.modal-dialog {
height: calc(100% - #{$toolbar-total-height}); // IE10 fix
}
.modal-content {
overflow: hidden;
border: 0;
height: 100%; // IE10 fix
}

5
admin/client/src/styles/_variables.scss
View File

@ -408,8 +408,8 @@ $zindex-popover: 1060;
// $zindex-tooltip: 1070;
// $zindex-navbar-fixed: 1030;
// $zindex-navbar-sticky: 1030;
// $zindex-modal-bg: 1040;
// $zindex-modal: 1050;
$zindex-modal-bg: 1040;
$zindex-modal: 1050;
// SS toolbars
@ -600,6 +600,7 @@ $modal-backdrop-opacity: .5;
$modal-header-border-color: #e5e5e5;
$modal-footer-border-color: $modal-header-border-color;
$modal-xl: calc(100% - #{$spacer-x * 4});
$modal-lg: 900px;
$modal-md: 600px;
$modal-sm: 300px;

3
admin/client/src/styles/legacy/_forms.scss
View File

@ -235,9 +235,6 @@ form.small .field, .field.small {
}
/* dropdowns */
.dropdown select {
margin-top: $grid-y;
}
.chosen-container-active .chosen-single {
border: 1px solid lighten($color-medium-separator, 10%);

4
admin/client/src/styles/legacy/_style.scss
View File

@ -99,10 +99,6 @@ body.cms {
color: $color-darker-bg;
}
a {
color: $color-text-blue-link;
}
.backlink {
span.btn-icon-back {
height: 16px;