diff options
| author | Mark Otto <[email protected]> | 2016-02-17 08:55:16 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-17 08:55:16 -0800 |
| commit | bfe20c2971c7796bb41242a8f918f7115321363f (patch) | |
| tree | 1a3c4111c6fa86c6b90e6ea9bc0d9f7103fed27d | |
| parent | 13c8ecd893bb4841087866b7a90344fbc8f64b9a (diff) | |
| parent | cbdb043ee372a269c32f11ce8f08074179a243e0 (diff) | |
| download | bootstrap-bfe20c2971c7796bb41242a8f918f7115321363f.tar.xz bootstrap-bfe20c2971c7796bb41242a8f918f7115321363f.zip | |
Merge pull request #19242 from twbs/carousel-caption-width
Extract $carousel-caption-width variable
| -rw-r--r-- | scss/_carousel.scss | 8 | ||||
| -rw-r--r-- | scss/_variables.scss | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/scss/_carousel.scss b/scss/_carousel.scss index 2e06e70d1..744ec2f56 100644 --- a/scss/_carousel.scss +++ b/scss/_carousel.scss @@ -201,9 +201,9 @@ .carousel-caption { position: absolute; - right: 15%; + right: ((100% - $carousel-caption-width) / 2); bottom: 20px; - left: 15%; + left: ((100% - $carousel-caption-width) / 2); z-index: 10; padding-top: 20px; padding-bottom: 20px; @@ -241,8 +241,8 @@ // Show and left align the captions .carousel-caption { - right: 20%; - left: 20%; + right: ((100% - $carousel-caption-sm-up-width) / 2); + left: ((100% - $carousel-caption-sm-up-width) / 2); padding-bottom: 30px; } diff --git a/scss/_variables.scss b/scss/_variables.scss index fdd917f8a..637c62d8e 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -783,6 +783,8 @@ $carousel-indicator-active-size: 12px !default; $carousel-indicator-active-bg: #fff !default; $carousel-indicator-border-color: #fff !default; +$carousel-caption-width: 70% !default; +$carousel-caption-sm-up-width: 60% !default; $carousel-caption-color: #fff !default; |