Allow multiple ways of padding declaration for modal header (twbs#26976)

MartijnCuppens · mdo · commit 7bd1bc243149 · 2018-09-18T21:33:31.000-07:00
* twbs#26967: Allow multiple ways of padding declaration for modal header * twbs#26976: split vertical and horizontal modal padding
diff --git a/scss/_modal.scss b/scss/_modal.scss
@@ -108,7 +108,7 @@
   .close {
     padding: $modal-header-padding;
     // auto on the left force icon to the right even when there is no .modal-title
-    margin: (-$modal-header-padding) (-$modal-header-padding) (-$modal-header-padding) auto;
+    margin: (-$modal-header-padding-y) (-$modal-header-padding-x) (-$modal-header-padding-y) auto;
   }
 }
 
diff --git a/scss/_variables.scss b/scss/_variables.scss
@@ -854,7 +854,9 @@ $modal-header-border-color:         $gray-200 !default;
 $modal-footer-border-color:         $modal-header-border-color !default;
 $modal-header-border-width:         $modal-content-border-width !default;
 $modal-footer-border-width:         $modal-header-border-width !default;
-$modal-header-padding:              1rem !default;
+$modal-header-padding-y:            1rem !default;
+$modal-header-padding-x:            1rem !default;
+$modal-header-padding:              $modal-header-padding-y $modal-header-padding-x !default; // Keep this for backwards compatibility
 
 $modal-xl:                          1140px !default;
 $modal-lg:                          800px !default;

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@`
`108`	`108`	`.close {`
`109`	`109`	`padding: $modal-header-padding;`
`110`	`110`	`// auto on the left force icon to the right even when there is no .modal-title`
`111`		`- margin: (-$modal-header-padding) (-$modal-header-padding) (-$modal-header-padding) auto;`
	`111`	`+ margin: (-$modal-header-padding-y) (-$modal-header-padding-x) (-$modal-header-padding-y) auto;`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`