diff options
| author | Mark Otto <[email protected]> | 2018-09-18 21:35:56 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2018-09-18 21:35:56 -0700 |
| commit | 2f611c657bdeb30aa5a065164c61ce213a8de196 (patch) | |
| tree | 129917710f41f9173b506cf7972c278c5ad97045 | |
| parent | f6244654a6389898f506eaa865bd900e994c077f (diff) | |
| parent | 7bd1bc243149c0e4602f872ab1613604de719e1d (diff) | |
| download | bootstrap-2f611c657bdeb30aa5a065164c61ce213a8de196.tar.xz bootstrap-2f611c657bdeb30aa5a065164c61ce213a8de196.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
| -rw-r--r-- | scss/_modal.scss | 2 | ||||
| -rw-r--r-- | scss/_variables.scss | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scss/_modal.scss b/scss/_modal.scss index bc349ff8e..cc8d41ca1 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 7b0d3a2f5..9ac52e3d3 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; |