]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #19236 from twbs/carousel-icon-width
authorMark Otto <markd.otto@gmail.com>
Sun, 8 May 2016 20:33:05 +0000 (13:33 -0700)
committerMark Otto <markd.otto@gmail.com>
Sun, 8 May 2016 20:33:05 +0000 (13:33 -0700)
Extract $carousel-icon-width variable

1  2 
scss/_carousel.scss
scss/_variables.scss

Simple merge
index 82ef6f96309c3eca5fae160d6f8f7a3b1cdabff5,0e2f8465250f5bb66296f9f61fb054ff8c74ab0f..f3c442e80e54dffc48969cf7e75900e4535f375e
@@@ -788,10 -766,10 +788,12 @@@ $carousel-indicator-active-size
  $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;
  
+ $carousel-icon-width:                         20px !default;
  
  // Close