aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2016-02-16 20:53:53 -0800
committerChris Rebert <[email protected]>2016-02-16 20:53:53 -0800
commitee0b3b2faa355b6d054d7e6d9424bfc19ef22ec4 (patch)
treebdb5dc3afefa9b107373503dcc96d0284d8593ef
parentb6b9d4202c0ca3c7dbfa320abd1f53c5eb917354 (diff)
parent9f85c6e1d1759d038e6ed441719bd4ef9aca8abd (diff)
downloadbootstrap-ee0b3b2faa355b6d054d7e6d9424bfc19ef22ec4.tar.xz
bootstrap-ee0b3b2faa355b6d054d7e6d9424bfc19ef22ec4.zip
Merge pull request #19235 from twbs/carousel-control-sm-up-width
Extract $carousel-control-sm-up-width variable
-rw-r--r--scss/_carousel.scss12
-rw-r--r--scss/_variables.scss1
2 files changed, 7 insertions, 6 deletions
diff --git a/scss/_carousel.scss b/scss/_carousel.scss
index af8c95c62..d6c7eda01 100644
--- a/scss/_carousel.scss
+++ b/scss/_carousel.scss
@@ -225,16 +225,16 @@
.carousel-control {
.icon-prev,
.icon-next {
- width: 30px;
- height: 30px;
- margin-top: -15px;
- font-size: 30px;
+ width: $carousel-control-sm-up-size;
+ height: $carousel-control-sm-up-size;
+ margin-top: -($carousel-control-sm-up-size / 2);
+ font-size: $carousel-control-sm-up-size;
}
.icon-prev {
- margin-left: -15px;
+ margin-left: -($carousel-control-sm-up-size / 2);
}
.icon-next {
- margin-right: -15px;
+ margin-right: -($carousel-control-sm-up-size / 2);
}
}
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 2c48a7059..6352b602b 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -760,6 +760,7 @@ $carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) !default;
$carousel-control-color: #fff !default;
$carousel-control-width: 15% !default;
+$carousel-control-sm-up-size: 30px !default;
$carousel-control-opacity: .5 !default;
$carousel-control-font-size: 20px !default;