mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-21 20:55:50 +02:00
Code Issues Releases Wiki Activity

Update carousel vars

Browse Source 
* Remove `@carousel-control-hover-color` since that's just the same as
the default control color and all we change is `opacity` (it's required
for specificity).
* Add vars to customizer
* Update customizer nav to include new section
* Remove the `li` from the var names
* Consolidate and simplify `text-shadow` vars
This commit is contained in:
Mark Otto
2013-07-23 23:03:57 -07:00
parent b0dd2f902d
commit a5cc1300f6
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
_includes/nav-customize.html
View File

@@ -21,6 +21,7 @@
<li><a href="#variables-breadcrumbs">Breadcrumbs</a></li> <li><a href="#variables-breadcrumbs">Breadcrumbs</a></li>
<li><a href="#variables-jumbotron">Jumbotron</a></li> <li><a href="#variables-jumbotron">Jumbotron</a></li>
<li><a href="#variables-modals">Modals</a></li> <li><a href="#variables-modals">Modals</a></li>
<li><a href="#variables-carousel">Carousel</a></li>
<li><a href="#variables-list-group">List group</a></li> <li><a href="#variables-list-group">List group</a></li>
<li><a href="#variables-thumbnails">Thumbnails</a></li> <li><a href="#variables-thumbnails">Thumbnails</a></li>
<li><a href="#variables-progress">Progress bars</a></li> <li><a href="#variables-progress">Progress bars</a></li>

14
customize.html
View File

@@ -976,6 +976,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
<p class="help-block">Jumbotron lead paragraph color</p> <p class="help-block">Jumbotron lead paragraph color</p>
</div> </div>
</div> </div>
<h2 id="variables-modals">Modals</h2> <h2 id="variables-modals">Modals</h2>
<div class="row"> <div class="row">
<div class="col-lg-4"> <div class="col-lg-4">
@@ -994,6 +995,19 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
<p class="help-block">Modal title line-height</p> <p class="help-block">Modal title line-height</p>
</div> </div>
</div> </div>
<h2 id="variables-carousel">Carousel</h2>
<label>@carousel-text-shadow</label>
<input type="text" placeholder="0 1px 2px rgba(0,0,0,.6)">
<label>@carousel-control-color</label>
<input type="text" placeholder="#fff">
<label>@carousel-indicator-border-color</label>
<input type="text" placeholder="#fff">
<label>@carousel-indicator-active-bg</label>
<input type="text" placeholder="#fff">
<label>@carousel-caption-color</label>
<input type="text" placeholder="#fff">
<h2 id="variables-list-group">List group</h2> <h2 id="variables-list-group">List group</h2>
<h3>Background</h3> <h3>Background</h3>
<div class="row"> <div class="row">

8
less/carousel.less
View File

@@ -93,7 +93,7 @@
// Hover/focus state // Hover/focus state
&:hover, &:hover,
&:focus { &:focus {
color: @carousel-control-hover-color; color: @carousel-control-color;
text-decoration: none; text-decoration: none;
.opacity(.9); .opacity(.9);
} }
@@ -144,7 +144,7 @@
height: 10px; height: 10px;
margin: 1px; margin: 1px;
text-indent: -999px; text-indent: -999px;
border: 1px solid @carousel-indicators-li-border-color; border: 1px solid @carousel-indicator-border-color;
border-radius: 10px; border-radius: 10px;
cursor: pointer; cursor: pointer;
} }
@@ -152,7 +152,7 @@
margin: 0; margin: 0;
width: 12px; width: 12px;
height: 12px; height: 12px;
background-color: @carousel-indicators-active-bg; background-color: @carousel-indicator-active-bg;
} }
} }
@@ -169,7 +169,7 @@
padding-bottom: 20px; padding-bottom: 20px;
color: @carousel-caption-color; color: @carousel-caption-color;
text-align: center; text-align: center;
text-shadow: @carousel-caption-text-shadow; text-shadow: @carousel-text-shadow;
& .btn { & .btn {
text-shadow: none; // No shadow for button elements in carousel-caption text-shadow: none; // No shadow for button elements in carousel-caption
} }

11
less/variables.less
View File

@@ -409,15 +409,14 @@
// Carousel // Carousel
// ------------------------ // ------------------------
@carousel-control-color: #fff; @carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6);
@carousel-control-hover-color: #fff;
@carousel-control-text-shadow: 0 1px 2px rgba(0,0,0,.6);
@carousel-indicators-active-bg: #fff; @carousel-control-color: #fff;
@carousel-indicators-li-border-color: #fff;
@carousel-indicator-border-color: #fff;
@carousel-indicator-active-bg: #fff;
@carousel-caption-color: #fff; @carousel-caption-color: #fff;
@carousel-caption-text-shadow: 0 1px 2px rgba(0,0,0,.6);
// Close // Close