1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

fixes #9909: Add component active color variable to complement component active bg variable

This commit is contained in:
Mark Otto 2013-09-01 23:38:11 +02:00
parent bfda156bb9
commit 1fd9237840
2 changed files with 8 additions and 3 deletions

View file

@ -554,10 +554,14 @@ base_url: "../"
<input type="text" class="form-control" placeholder="6px" data-var="@border-radius-large"> <input type="text" class="form-control" placeholder="6px" data-var="@border-radius-large">
<label>@border-radius-small</label> <label>@border-radius-small</label>
<input type="text" class="form-control" placeholder="3px" data-var="@border-radius-small"> <input type="text" class="form-control" placeholder="3px" data-var="@border-radius-small">
<h4>Active text color</h4>
<label>@component-active-color</label>
<input type="text" class="form-control" placeholder="#fff" data-var="@component-active-color">
<p class="help-block">Global color for active items (e.g., navs or dropdowns)</p>
<h4>Active background color</h4> <h4>Active background color</h4>
<label>@component-active-bg</label> <label>@component-active-bg</label>
<input type="text" class="form-control" placeholder="@brand-primary" data-var="@component-active-bg"> <input type="text" class="form-control" placeholder="@brand-primary" data-var="@component-active-bg">
<p class="help-block">Used for active or hovered items in places like navs or dropdowns.</p> <p class="help-block">Global background color for active items (e.g., navs or dropdowns)</p>
</div> </div>
</div> </div>
@ -923,7 +927,7 @@ base_url: "../"
<p class="help-block">Hovered dropdown menu entry text color</p> <p class="help-block">Hovered dropdown menu entry text color</p>
<label>@dropdown-link-active-color</label> <label>@dropdown-link-active-color</label>
<input type="text" class="form-control" placeholder="#fff" data-var="@dropdown-link-active-color"> <input type="text" class="form-control" placeholder="@component-active-color" data-var="@dropdown-link-active-color">
<p class="help-block">Active dropdown menu entry text color</p> <p class="help-block">Active dropdown menu entry text color</p>
<label>@dropdown-link-active-bg</label> <label>@dropdown-link-active-bg</label>
<input type="text" class="form-control" placeholder="@component-active-bg" data-var="@dropdown-link-active-bg"> <input type="text" class="form-control" placeholder="@component-active-bg" data-var="@dropdown-link-active-bg">

View file

@ -91,6 +91,7 @@
@border-radius-large: 6px; @border-radius-large: 6px;
@border-radius-small: 3px; @border-radius-small: 3px;
@component-active-color: #fff;
@component-active-bg: @brand-primary; @component-active-bg: @brand-primary;
@caret-width-base: 4px; @caret-width-base: 4px;
@ -178,7 +179,7 @@
@dropdown-link-hover-color: darken(@gray-dark, 5%); @dropdown-link-hover-color: darken(@gray-dark, 5%);
@dropdown-link-hover-bg: #f5f5f5; @dropdown-link-hover-bg: #f5f5f5;
@dropdown-link-active-color: #fff; @dropdown-link-active-color: @component-active-color;
@dropdown-link-active-bg: @component-active-bg; @dropdown-link-active-bg: @component-active-bg;
@dropdown-link-disabled-color: @gray-light; @dropdown-link-disabled-color: @gray-light;