0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00
This commit is contained in:
Mark Otto 2014-08-23 13:35:22 -07:00
parent f36e1c467c
commit 4fc96e8029
10 changed files with 17 additions and 21 deletions

View File

@ -635,7 +635,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var data = $this.data('bs.collapse')
var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
if (!data && options.toggle && option == 'show') option = !option
if (!data && options.toggle && option == 'show') options.toggle = false
if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
if (typeof option == 'string') data[option]()
})

File diff suppressed because one or more lines are too long

View File

@ -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">

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -4281,7 +4281,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
border-color: #080808;
}
.navbar-inverse .navbar-brand {
color: #777;
color: #9d9d9d;
}
.navbar-inverse .navbar-brand:hover,
.navbar-inverse .navbar-brand:focus {
@ -4289,10 +4289,10 @@ fieldset[disabled] .navbar-default .btn-link:focus {
background-color: transparent;
}
.navbar-inverse .navbar-text {
color: #969696;
color: #9d9d9d;
}
.navbar-inverse .navbar-nav > li > a {
color: #777;
color: #9d9d9d;
}
.navbar-inverse .navbar-nav > li > a:hover,
.navbar-inverse .navbar-nav > li > a:focus {
@ -4339,7 +4339,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
background-color: #080808;
}
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
color: #777;
color: #9d9d9d;
}
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
@ -4360,13 +4360,13 @@ fieldset[disabled] .navbar-default .btn-link:focus {
}
}
.navbar-inverse .navbar-link {
color: #777;
color: #9d9d9d;
}
.navbar-inverse .navbar-link:hover {
color: #fff;
}
.navbar-inverse .btn-link {
color: #777;
color: #9d9d9d;
}
.navbar-inverse .btn-link:hover,
.navbar-inverse .btn-link:focus {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -635,7 +635,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var data = $this.data('bs.collapse')
var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
if (!data && options.toggle && option == 'show') option = !option
if (!data && options.toggle && option == 'show') options.toggle = false
if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
if (typeof option == 'string') data[option]()
})

File diff suppressed because one or more lines are too long