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:
authorPatrick Yeo <patrick.yeo@liferay.com>2017-06-09 06:27:19 +0300
committerMark Otto <markd.otto@gmail.com>2017-06-13 18:45:11 +0300
commit5e651615a3a60c646b6ed90881b6291bdef49208 (patch)
tree2671602e6d57adf76af7dace3dc705df17742184 /scss
parent441f114681c496488f3c655d41b5779881ce1530 (diff)
(#22414) Renamed for consistency `$modal-dialog-sm-up-margin-y`, `$modal-content-xs-box-shadow`, `$modal-content-sm-up-box-shadow`, to `$modal-dialog-margin-y-sm-up`, `$modal-content-box-shadow-xs`, `$modal-content-box-shadow-sm-up`, respectively
Diffstat (limited to 'scss')
-rw-r--r--scss/_modal.scss6
-rw-r--r--scss/_variables.scss6
2 files changed, 6 insertions, 6 deletions
diff --git a/scss/_modal.scss b/scss/_modal.scss
index 9d2a86776d..c0c4067162 100644
--- a/scss/_modal.scss
+++ b/scss/_modal.scss
@@ -54,7 +54,7 @@
background-clip: padding-box;
border: $modal-content-border-width solid $modal-content-border-color;
@include border-radius($border-radius-lg);
- @include box-shadow($modal-content-xs-box-shadow);
+ @include box-shadow($modal-content-box-shadow-xs);
// Remove focus outline from opened modal
outline: 0;
}
@@ -127,11 +127,11 @@
// Automatically set modal's width for larger viewports
.modal-dialog {
max-width: $modal-md;
- margin: $modal-dialog-sm-up-margin-y auto;
+ margin: $modal-dialog-margin-y-sm-up auto;
}
.modal-content {
- @include box-shadow($modal-content-sm-up-box-shadow);
+ @include box-shadow($modal-content-box-shadow-sm-up);
}
.modal-sm { max-width: $modal-sm; }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index f1e2ede7bf..3ce512eb18 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -761,15 +761,15 @@ $badge-pill-border-radius: 10rem !default;
$modal-inner-padding: 15px !default;
$modal-dialog-margin: 10px !default;
-$modal-dialog-sm-up-margin-y: 30px !default;
+$modal-dialog-margin-y-sm-up: 30px !default;
$modal-title-line-height: $line-height-base !default;
$modal-content-bg: $white !default;
$modal-content-border-color: rgba($black,.2) !default;
$modal-content-border-width: $border-width !default;
-$modal-content-xs-box-shadow: 0 3px 9px rgba($black,.5) !default;
-$modal-content-sm-up-box-shadow: 0 5px 15px rgba($black,.5) !default;
+$modal-content-box-shadow-xs: 0 3px 9px rgba($black,.5) !default;
+$modal-content-box-shadow-sm-up: 0 5px 15px rgba($black,.5) !default;
$modal-backdrop-bg: $black !default;
$modal-backdrop-opacity: .5 !default;