From 35e313de17acbf88a6b1c33c74f07136e25310cc Mon Sep 17 00:00:00 2001
From: Paul Clarke <paul@silverstripe.com>
Date: Mon, 21 Nov 2016 15:37:05 +1300
Subject: [PATCH] Enhancement Fix height for modal in IE10 Enhancement Remove
 link color specific to header Enhancement Close panel class renamed, as it is
 not always top right

---
 admin/client/dist/styles/bundle.css           | 21 +++++++------------
 .../src/components/FormAction/FormAction.scss |  2 +-
 .../src/components/FormAlert/FormAlert.scss   |  4 ----
 admin/client/src/components/Modal/Modal.scss  |  5 +++++
 admin/client/src/styles/_variables.scss       |  5 +++--
 admin/client/src/styles/legacy/_forms.scss    |  3 ---
 admin/client/src/styles/legacy/_style.scss    |  4 ----
 7 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/admin/client/dist/styles/bundle.css b/admin/client/dist/styles/bundle.css
index 7f5b540b2..492b7a7e6 100644
--- a/admin/client/dist/styles/bundle.css
+++ b/admin/client/dist/styles/bundle.css
@@ -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{
diff --git a/admin/client/src/components/FormAction/FormAction.scss b/admin/client/src/components/FormAction/FormAction.scss
index 7656c8635..a2cd61916 100644
--- a/admin/client/src/components/FormAction/FormAction.scss
+++ b/admin/client/src/components/FormAction/FormAction.scss
@@ -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;
diff --git a/admin/client/src/components/FormAlert/FormAlert.scss b/admin/client/src/components/FormAlert/FormAlert.scss
index d2ef2ef5c..32ae26ce5 100644
--- a/admin/client/src/components/FormAlert/FormAlert.scss
+++ b/admin/client/src/components/FormAlert/FormAlert.scss
@@ -2,7 +2,3 @@
   padding: 0;
   margin-top: -1px;
 }
-
-.message-box--panel-top {
-  margin-right: $spacer * 1.5;
-}
diff --git a/admin/client/src/components/Modal/Modal.scss b/admin/client/src/components/Modal/Modal.scss
index a599df055..d0ce9ebfa 100644
--- a/admin/client/src/components/Modal/Modal.scss
+++ b/admin/client/src/components/Modal/Modal.scss
@@ -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
 }
 
 
diff --git a/admin/client/src/styles/_variables.scss b/admin/client/src/styles/_variables.scss
index da4a18b6f..6fbd282bd 100644
--- a/admin/client/src/styles/_variables.scss
+++ b/admin/client/src/styles/_variables.scss
@@ -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;
diff --git a/admin/client/src/styles/legacy/_forms.scss b/admin/client/src/styles/legacy/_forms.scss
index 67d714146..ff1dba05b 100644
--- a/admin/client/src/styles/legacy/_forms.scss
+++ b/admin/client/src/styles/legacy/_forms.scss
@@ -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%);
diff --git a/admin/client/src/styles/legacy/_style.scss b/admin/client/src/styles/legacy/_style.scss
index 7c3f82432..09d995d4d 100644
--- a/admin/client/src/styles/legacy/_style.scss
+++ b/admin/client/src/styles/legacy/_style.scss
@@ -99,10 +99,6 @@ body.cms {
     color: $color-darker-bg;
   }
 
-  a {
-    color: $color-text-blue-link;
-  }
-
   .backlink {
     span.btn-icon-back {
       height: 16px;