sharpetronics/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-06-01 00:01:36 -04:00
Code Issues Projects Releases Wiki Activity

grunt

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/js/bootstrap.js vendored
View File

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

2
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
docs/_includes/customizer-variables.html
View File

@ -730,7 +730,7 @@
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@navbar-inverse-color">@navbar-inverse-color</label> <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>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@navbar-inverse-bg">@navbar-inverse-bg</label> <label for="input-@navbar-inverse-bg">@navbar-inverse-bg</label>
@ -742,7 +742,7 @@
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@navbar-inverse-link-color">@navbar-inverse-link-color</label> <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>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@navbar-inverse-link-hover-color">@navbar-inverse-link-hover-color</label> <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> <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"/> <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>
<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> </div>
<h2 id="tabs">Tabs</h2> <h2 id="tabs">Tabs</h2>
<div class="row"> <div class="row">

2
docs/assets/js/customize.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
docs/assets/js/raw-files.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
docs/dist/css/bootstrap.css vendored
View File

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

2
docs/dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/js/bootstrap.js vendored
View File

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

2
docs/dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long