diff options
| author | Mark Otto <[email protected]> | 2016-02-17 08:54:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-17 08:54:25 -0800 |
| commit | 48a338c27cd619443758e580f9bea52bacfd1660 (patch) | |
| tree | 3b504d202bf0d82d8c45331190d55acb5ce07aa4 | |
| parent | fb1d511a2aac334811d5e0a07bf22d776d0c7eac (diff) | |
| parent | 104ace17cb56b545ddee9e7435f77c11deb3715b (diff) | |
| download | bootstrap-48a338c27cd619443758e580f9bea52bacfd1660.tar.xz bootstrap-48a338c27cd619443758e580f9bea52bacfd1660.zip | |
Merge pull request #19237 from twbs/carousel-indicator-size
Extract $carousel-indicator{-active}-size variables
| -rw-r--r-- | scss/_carousel.scss | 11 | ||||
| -rw-r--r-- | scss/_variables.scss | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/scss/_carousel.scss b/scss/_carousel.scss index d6c7eda01..2e06e70d1 100644 --- a/scss/_carousel.scss +++ b/scss/_carousel.scss @@ -171,8 +171,8 @@ li { display: inline-block; - width: 10px; - height: 10px; + width: $carousel-indicator-size; + height: $carousel-indicator-size; margin: 1px; text-indent: -999px; cursor: pointer; @@ -183,11 +183,12 @@ // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Internet_Explorer background-color: rgba(0,0,0,0); // IE9 border: 1px solid $carousel-indicator-border-color; - border-radius: 10px; + border-radius: $carousel-indicator-size; } + .active { - width: 12px; - height: 12px; + width: $carousel-indicator-active-size; + height: $carousel-indicator-active-size; margin: 0; background-color: $carousel-indicator-active-bg; } diff --git a/scss/_variables.scss b/scss/_variables.scss index 213bd3b7b..85d121b2c 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -777,6 +777,8 @@ $carousel-control-sm-up-size: 30px !default; $carousel-control-opacity: .5 !default; $carousel-control-font-size: 20px !default; +$carousel-indicator-size: 10px !default; +$carousel-indicator-active-size: 12px !default; $carousel-indicator-active-bg: #fff !default; $carousel-indicator-border-color: #fff !default; |