aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-11-23 11:39:23 -0800
committerGitHub <[email protected]>2016-11-23 11:39:23 -0800
commit7124388fdb368f6ce33e3f7a6eff91ceba0b7235 (patch)
tree14642f27001c7b76792c99759cfe1e805e4f7e73
parentec47feefd6336d0c253b49654459919b53d45752 (diff)
parent7f05cb9e94cf9cc2039c9e858d1a43821d9eee09 (diff)
downloadbootstrap-7124388fdb368f6ce33e3f7a6eff91ceba0b7235.tar.xz
bootstrap-7124388fdb368f6ce33e3f7a6eff91ceba0b7235.zip
Merge pull request #21118 from Elliot-Evans-95/v4-dev
renamed modal-title-padding to modal-header-padding
-rw-r--r--scss/_modal.scss2
-rw-r--r--scss/_variables.scss2
2 files changed, 2 insertions, 2 deletions
diff --git a/scss/_modal.scss b/scss/_modal.scss
index f44cc7b32..c6f56637d 100644
--- a/scss/_modal.scss
+++ b/scss/_modal.scss
@@ -75,7 +75,7 @@
// Modal header
// Top section of the modal w/ title and dismiss
.modal-header {
- padding: $modal-title-padding;
+ padding: $modal-header-padding;
border-bottom: $modal-header-border-width solid $modal-header-border-color;
@include clearfix;
}
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 06866b375..961988e78 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -756,7 +756,6 @@ $modal-inner-padding: 15px !default;
$modal-dialog-margin: 10px !default;
$modal-dialog-sm-up-margin-y: 30px !default;
-$modal-title-padding: 15px !default;
$modal-title-line-height: $line-height-base !default;
$modal-content-bg: #fff !default;
@@ -771,6 +770,7 @@ $modal-header-border-color: #e5e5e5 !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: 15px !default;
$modal-lg: 900px !default;
$modal-md: 600px !default;