Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMartijn Cuppens <martijn.cuppens@gmail.com>2018-09-19 07:33:31 +0300
committerMark Otto <otto@github.com>2018-09-19 07:33:31 +0300
commit7bd1bc243149c0e4602f872ab1613604de719e1d (patch)
tree249bc8256eb9a02978f9237dc7c3df1905ab988f /scss
parent0bec1c889711823494d2821fa6e5841169df4797 (diff)
Allow multiple ways of padding declaration for modal header (#26976)
* #26967: Allow multiple ways of padding declaration for modal header * #26976: split vertical and horizontal modal padding
Diffstat (limited to 'scss')
-rw-r--r--scss/_modal.scss2
-rw-r--r--scss/_variables.scss4
2 files changed, 4 insertions, 2 deletions
diff --git a/scss/_modal.scss b/scss/_modal.scss
index bc349ff8e6..cc8d41ca1c 100644
--- 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
index 7b0d3a2f5a..9ac52e3d32 100644
--- 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;