diff options
| author | Mark Otto <[email protected]> | 2014-08-27 22:38:46 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-08-27 22:38:46 -0700 |
| commit | f4eefd28d10198ea60ce4069c00236e74cda1bf5 (patch) | |
| tree | 9141bf9c907a2bf7962ca5abdb6f0c8496d8b1ad /docs/_includes/customizer-variables.html | |
| parent | dfa2759a52e73e720b0cda302a1edb9e2dbebc1f (diff) | |
| parent | 1ebc7e62a8672c59c3bd886bc71ca90e9571d1bc (diff) | |
| download | bootstrap-f4eefd28d10198ea60ce4069c00236e74cda1bf5.tar.xz bootstrap-f4eefd28d10198ea60ce4069c00236e74cda1bf5.zip | |
Merge branch 'master' into sr_friendly_hidden_content
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes/customizer-variables.html')
| -rw-r--r-- | docs/_includes/customizer-variables.html | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html index ab47463be..552069005 100644 --- a/docs/_includes/customizer-variables.html +++ b/docs/_includes/customizer-variables.html @@ -730,7 +730,7 @@ </div> <div class="bs-customizer-input"> <label for="input-@navbar-inverse-color">@navbar-inverse-color</label> - <input id="input-@navbar-inverse-color" type="text" value="lighten(@gray-light, 12%)" data-var="@navbar-inverse-color" class="form-control"/> + <input id="input-@navbar-inverse-color" type="text" value="lighten(@gray-light, 15%)" data-var="@navbar-inverse-color" class="form-control"/> </div> <div class="bs-customizer-input"> <label for="input-@navbar-inverse-bg">@navbar-inverse-bg</label> @@ -742,7 +742,7 @@ </div> <div class="bs-customizer-input"> <label for="input-@navbar-inverse-link-color">@navbar-inverse-link-color</label> - <input id="input-@navbar-inverse-link-color" type="text" value="@gray-light" data-var="@navbar-inverse-link-color" class="form-control"/> + <input id="input-@navbar-inverse-link-color" type="text" value="lighten(@gray-light, 15%)" data-var="@navbar-inverse-link-color" class="form-control"/> </div> <div class="bs-customizer-input"> <label for="input-@navbar-inverse-link-hover-color">@navbar-inverse-link-hover-color</label> @@ -813,10 +813,6 @@ <label for="input-@nav-disabled-link-hover-color">@nav-disabled-link-hover-color</label> <input id="input-@nav-disabled-link-hover-color" type="text" value="@gray-light" data-var="@nav-disabled-link-hover-color" class="form-control"/> </div> - <div class="bs-customizer-input"> - <label for="input-@nav-open-link-hover-color">@nav-open-link-hover-color</label> - <input id="input-@nav-open-link-hover-color" type="text" value="#fff" data-var="@nav-open-link-hover-color" class="form-control"/> - </div> </div> <h2 id="tabs">Tabs</h2> <div class="row"> @@ -1092,7 +1088,7 @@ </div> <div class="bs-customizer-input"> <label for="input-@popover-arrow-color">@popover-arrow-color</label> - <input id="input-@popover-arrow-color" type="text" value="#fff" data-var="@popover-arrow-color" class="form-control"/> + <input id="input-@popover-arrow-color" type="text" value="@popover-bg" data-var="@popover-arrow-color" class="form-control"/> <p class="help-block">Popover arrow color</p> </div> <div class="bs-customizer-input"> |