Commit f4eefd28 authored by Mark Otto's avatar Mark Otto

Merge branch 'master' into sr_friendly_hidden_content

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
parents dfa2759a 1ebc7e62
...@@ -18,8 +18,8 @@ after_script: ...@@ -18,8 +18,8 @@ after_script:
- if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi - if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi
env: env:
global: global:
- JEKYLL_VERSION: 2.1.1 - JEKYLL_VERSION: 2.3.0
- ROUGE_VERSION: 1.6.1 - ROUGE_VERSION: 1.6.2
- SAUCE_USERNAME: bootstrap - SAUCE_USERNAME: bootstrap
- secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ=" - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="
- secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY=" - secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY="
......
# [Bootstrap](http://getbootstrap.com) # [Bootstrap](http://getbootstrap.com)
[![Bower version](https://badge.fury.io/bo/bootstrap.svg)](http://badge.fury.io/bo/bootstrap) [![Bower version](https://badge.fury.io/bo/bootstrap.svg)](http://badge.fury.io/bo/bootstrap)
[![NPM version](https://badge.fury.io/js/bootstrap.svg)](http://badge.fury.io/js/bootstrap) [![NPM version](https://badge.fury.io/js/bootstrap.svg)](http://badge.fury.io/js/bootstrap)
[![Build Status](https://secure.travis-ci.org/twbs/bootstrap.svg?branch=master)](http://travis-ci.org/twbs/bootstrap) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.svg?branch=master)](https://travis-ci.org/twbs/bootstrap)
[![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.svg)](https://david-dm.org/twbs/bootstrap#info=devDependencies) [![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.svg)](https://david-dm.org/twbs/bootstrap#info=devDependencies)
[![Selenium Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap) [![Selenium Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap)
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat), and maintained by the [core team](https://github.com/twbs?tab=members) with the massive support and involvement of the community. Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thornton](https://twitter.com/fat), and maintained by the [core team](https://github.com/twbs?tab=members) with the massive support and involvement of the community.
To get started, check out <http://getbootstrap.com>! To get started, check out <http://getbootstrap.com>!
## Table of contents ## Table of contents
- [Quick start](#quick-start) - [Quick start](#quick-start)
- [Bugs and feature requests](#bugs-and-feature-requests) - [Bugs and feature requests](#bugs-and-feature-requests)
- [Documentation](#documentation) - [Documentation](#documentation)
- [Contributing](#contributing) - [Contributing](#contributing)
- [Community](#community) - [Community](#community)
- [Versioning](#versioning) - [Versioning](#versioning)
- [Creators](#creators) - [Creators](#creators)
- [Copyright and license](#copyright-and-license) - [Copyright and license](#copyright-and-license)
## Quick start ## Quick start
...@@ -66,8 +66,8 @@ Bootstrap's documentation, included in this repo in the root directory, is built ...@@ -66,8 +66,8 @@ Bootstrap's documentation, included in this repo in the root directory, is built
### Running documentation locally ### Running documentation locally
1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.1.x). 1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.3.x).
- **Windows users:** Read [this unofficial guide](https://github.com/juthilo/run-jekyll-on-windows/) to get Jekyll up and running without problems. - **Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems.
2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`. 2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`.
3. From the root `/bootstrap` directory, run `jekyll serve` in the command line. 3. From the root `/bootstrap` directory, run `jekyll serve` in the command line.
4. Open <http://localhost:9001> in your browser, and voilà. 4. Open <http://localhost:9001> in your browser, and voilà.
...@@ -86,7 +86,7 @@ Documentation for v2.3.2 has been made available for the time being at <http://g ...@@ -86,7 +86,7 @@ Documentation for v2.3.2 has been made available for the time being at <http://g
Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development. Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
Moreover, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo). Moreover, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](https://github.com/mdo/code-guide), maintained by [Mark Otto](https://github.com/mdo).
Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>. Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
...@@ -96,9 +96,9 @@ Editor preferences are available in the [editor config](https://github.com/twbs/ ...@@ -96,9 +96,9 @@ Editor preferences are available in the [editor config](https://github.com/twbs/
Keep track of development and community news. Keep track of development and community news.
- Follow [@twbootstrap on Twitter](http://twitter.com/twbootstrap). - Follow [@twbootstrap on Twitter](https://twitter.com/twbootstrap).
- Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com). - Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com).
- Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##twitter-bootstrap` channel. - Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel.
- Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](http://stackoverflow.com/questions/tagged/twitter-bootstrap-3)). - Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](http://stackoverflow.com/questions/tagged/twitter-bootstrap-3)).
...@@ -113,13 +113,13 @@ For transparency into our release cycle and in striving to maintain backward com ...@@ -113,13 +113,13 @@ For transparency into our release cycle and in striving to maintain backward com
**Mark Otto** **Mark Otto**
- <http://twitter.com/mdo> - <https://twitter.com/mdo>
- <http://github.com/mdo> - <https://github.com/mdo>
**Jacob Thornton** **Jacob Thornton**
- <http://twitter.com/fat> - <https://twitter.com/fat>
- <http://github.com/fat> - <https://github.com/fat>
......
...@@ -205,8 +205,8 @@ th { ...@@ -205,8 +205,8 @@ th {
abbr[title]:after { abbr[title]:after {
content: " (" attr(title) ")"; content: " (" attr(title) ")";
} }
a[href^="javascript:"]:after, a[href^="#"]:after,
a[href^="#"]:after { a[href^="javascript:"]:after {
content: ""; content: "";
} }
pre, pre,
...@@ -241,10 +241,6 @@ th { ...@@ -241,10 +241,6 @@ th {
.navbar { .navbar {
display: none; display: none;
} }
.table td,
.table th {
background-color: #fff !important;
}
.btn > .caret, .btn > .caret,
.dropup > .btn > .caret { .dropup > .btn > .caret {
border-top-color: #000 !important; border-top-color: #000 !important;
...@@ -255,6 +251,10 @@ th { ...@@ -255,6 +251,10 @@ th {
.table { .table {
border-collapse: collapse !important; border-collapse: collapse !important;
} }
.table td,
.table th {
background-color: #fff !important;
}
.table-bordered th, .table-bordered th,
.table-bordered td { .table-bordered td {
border: 1px solid #ddd !important; border: 1px solid #ddd !important;
...@@ -4285,7 +4285,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { ...@@ -4285,7 +4285,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 {
...@@ -4293,10 +4293,10 @@ fieldset[disabled] .navbar-default .btn-link:focus { ...@@ -4293,10 +4293,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 {
...@@ -4343,7 +4343,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { ...@@ -4343,7 +4343,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 {
...@@ -4364,13 +4364,13 @@ fieldset[disabled] .navbar-default .btn-link:focus { ...@@ -4364,13 +4364,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 {
...@@ -5696,6 +5696,9 @@ button.close { ...@@ -5696,6 +5696,9 @@ button.close {
display: none; display: none;
max-width: 276px; max-width: 276px;
padding: 1px; padding: 1px;
font-size: 14px;
font-weight: normal;
line-height: 1.42857143;
text-align: left; text-align: left;
white-space: normal; white-space: normal;
background-color: #fff; background-color: #fff;
...@@ -5723,8 +5726,6 @@ button.close { ...@@ -5723,8 +5726,6 @@ button.close {
padding: 8px 14px; padding: 8px 14px;
margin: 0; margin: 0;
font-size: 14px; font-size: 14px;
font-weight: normal;
line-height: 18px;
background-color: #f7f7f7; background-color: #f7f7f7;
border-bottom: 1px solid #ebebeb; border-bottom: 1px solid #ebebeb;
border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0;
......
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -635,7 +635,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -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]()
}) })
......
This diff is collapsed.
...@@ -730,7 +730,7 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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">
...@@ -1092,7 +1088,7 @@ ...@@ -1092,7 +1088,7 @@
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@popover-arrow-color">@popover-arrow-color</label> <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> <p class="help-block">Popover arrow color</p>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
......
<div class="bs-docs-section"> <div class="bs-docs-section">
<h1 id="carousel" class="page-header">Carousel <small>carousel.js</small></h1> <h1 id="carousel" class="page-header">Carousel <small>carousel.js</small></h1>
<p>A slideshow component for cycling through elemnts, like a carousel. <strong>Nested carousels are not supported.</strong></p>
<h2 id="carousel-examples">Examples</h2> <h2 id="carousel-examples">Examples</h2>
<p>The slideshow below shows a generic plugin and component for cycling through elements like a carousel.</p>
<div class="bs-example"> <div class="bs-example">
<div id="carousel-example-generic" class="carousel slide" data-ride="carousel"> <div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
<ol class="carousel-indicators"> <ol class="carousel-indicators">
......
This diff is collapsed.
...@@ -1143,7 +1143,6 @@ h1[id] { ...@@ -1143,7 +1143,6 @@ h1[id] {
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
word-break: normal; word-break: normal;
word-wrap: nowrap;
white-space: nowrap; white-space: nowrap;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
...@@ -1391,13 +1390,16 @@ h1[id] { ...@@ -1391,13 +1390,16 @@ h1[id] {
margin-top: 0; margin-top: 0;
margin-bottom: 5px; margin-bottom: 5px;
} }
.bs-dropzone hr {
width: 100px;
}
.bs-dropzone .lead { .bs-dropzone .lead {
margin-bottom: 10px; margin-bottom: 10px;
font-weight: normal; font-weight: normal;
color: #333; color: #333;
} }
.bs-dropzone hr { /*.bs-dropzone*/ #import-manual-trigger {
width: 100px; cursor: pointer;
} }
.bs-dropzone p:last-child { .bs-dropzone p:last-child {
margin-bottom: 0; margin-bottom: 0;
......
This diff is collapsed.
This diff is collapsed.
...@@ -205,8 +205,8 @@ th { ...@@ -205,8 +205,8 @@ th {
abbr[title]:after { abbr[title]:after {
content: " (" attr(title) ")"; content: " (" attr(title) ")";
} }
a[href^="javascript:"]:after, a[href^="#"]:after,
a[href^="#"]:after { a[href^="javascript:"]:after {
content: ""; content: "";
} }
pre, pre,
...@@ -241,10 +241,6 @@ th { ...@@ -241,10 +241,6 @@ th {
.navbar { .navbar {
display: none; display: none;
} }
.table td,
.table th {
background-color: #fff !important;
}
.btn > .caret, .btn > .caret,
.dropup > .btn > .caret { .dropup > .btn > .caret {
border-top-color: #000 !important; border-top-color: #000 !important;
...@@ -255,6 +251,10 @@ th { ...@@ -255,6 +251,10 @@ th {
.table { .table {
border-collapse: collapse !important; border-collapse: collapse !important;
} }
.table td,
.table th {
background-color: #fff !important;
}
.table-bordered th, .table-bordered th,
.table-bordered td { .table-bordered td {
border: 1px solid #ddd !important; border: 1px solid #ddd !important;
...@@ -3178,9 +3178,11 @@ input[type="button"].btn-block { ...@@ -3178,9 +3178,11 @@ input[type="button"].btn-block {
} }
.collapse { .collapse {
display: none; display: none;
visibility: hidden;
} }
.collapse.in { .collapse.in {
display: block; display: block;
visibility: visibile;
} }
tr.collapse.in { tr.collapse.in {
display: table-row; display: table-row;
...@@ -3846,9 +3848,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn { ...@@ -3846,9 +3848,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
} }
.tab-content > .tab-pane { .tab-content > .tab-pane {
display: none; display: none;
visibility: hidden;
} }
.tab-content > .active { .tab-content > .active {
display: block; display: block;
visibility: visible;
} }
.nav-tabs .dropdown-menu { .nav-tabs .dropdown-menu {
margin-top: -1px; margin-top: -1px;
...@@ -4281,7 +4285,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { ...@@ -4281,7 +4285,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 +4293,10 @@ fieldset[disabled] .navbar-default .btn-link:focus { ...@@ -4289,10 +4293,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 +4343,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { ...@@ -4339,7 +4343,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 +4364,13 @@ fieldset[disabled] .navbar-default .btn-link:focus { ...@@ -4360,13 +4364,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 {
...@@ -5692,6 +5696,9 @@ button.close { ...@@ -5692,6 +5696,9 @@ button.close {
display: none; display: none;
max-width: 276px; max-width: 276px;
padding: 1px; padding: 1px;
font-size: 14px;
font-weight: normal;
line-height: 1.42857143;
text-align: left; text-align: left;
white-space: normal; white-space: normal;
background-color: #fff; background-color: #fff;
...@@ -5719,8 +5726,6 @@ button.close { ...@@ -5719,8 +5726,6 @@ button.close {
padding: 8px 14px; padding: 8px 14px;
margin: 0; margin: 0;
font-size: 14px; font-size: 14px;
font-weight: normal;
line-height: 18px;
background-color: #f7f7f7; background-color: #f7f7f7;
border-bottom: 1px solid #ebebeb; border-bottom: 1px solid #ebebeb;
border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0;
......
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -635,7 +635,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -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]()
}) })
......
This diff is collapsed.
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
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]()
}) })
......
...@@ -102,6 +102,38 @@ $(function () { ...@@ -102,6 +102,38 @@ $(function () {
$target.click() $target.click()
}) })
test('should not close a collapse when initialized with "show" if already shown', function () {
stop()
expect(0)
var $test = $('<div id="test1" class="in"/>')
.appendTo('#qunit-fixture')
.on('hide.bs.collapse', function () {
ok(false)
})
$test.bootstrapCollapse('show')
setTimeout(start, 0)
})
test('should open a collapse when initialized with "show" if not already shown', function () {
stop()
expect(1)
var $test = $('<div id="test1" />')
.appendTo('#qunit-fixture')
.on('show.bs.collapse', function () {
ok(true)
})
$test.bootstrapCollapse('show')
setTimeout(start, 0)
})
test('should remove "collapsed" class from active accordion target', function () { test('should remove "collapsed" class from active accordion target', function () {
stop() stop()
......
...@@ -103,9 +103,8 @@ ...@@ -103,9 +103,8 @@
&:focus { &:focus {
color: @dropdown-link-disabled-color; color: @dropdown-link-disabled-color;
} }
}
// Nuke hover/focus effects // Nuke hover/focus effects
.dropdown-menu > .disabled > a {
&:hover, &:hover,
&:focus { &:focus {
text-decoration: none; text-decoration: none;
...@@ -212,4 +211,3 @@ ...@@ -212,4 +211,3 @@
} }
} }
} }
...@@ -75,7 +75,7 @@ a.list-group-item { ...@@ -75,7 +75,7 @@ a.list-group-item {
background-color: @list-group-disabled-bg; background-color: @list-group-disabled-bg;
color: @list-group-disabled-color; color: @list-group-disabled-color;
cursor: not-allowed; cursor: not-allowed;
// Force color to inherit for custom content // Force color to inherit for custom content
.list-group-item-heading { .list-group-item-heading {
color: inherit; color: inherit;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.label-variant(@color) { .label-variant(@color) {
background-color: @color; background-color: @color;
&[href] { &[href] {
&:hover, &:hover,
&:focus { &:focus {
......
...@@ -51,5 +51,4 @@ ...@@ -51,5 +51,4 @@
cursor: not-allowed; cursor: not-allowed;
} }
} }
} }
...@@ -11,7 +11,11 @@ ...@@ -11,7 +11,11 @@
display: none; display: none;
max-width: @popover-max-width; max-width: @popover-max-width;
padding: 1px; padding: 1px;
text-align: left; // Reset given new insertion method // Reset font and text propertes given new insertion method
font-size: @font-size-base;
font-weight: normal;
line-height: @line-height-base;
text-align: left;
background-color: @popover-bg; background-color: @popover-bg;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid @popover-fallback-border-color; border: 1px solid @popover-fallback-border-color;
...@@ -33,8 +37,6 @@ ...@@ -33,8 +37,6 @@
margin: 0; // reset heading margin margin: 0; // reset heading margin
padding: 8px 14px; padding: 8px 14px;
font-size: @font-size-base; font-size: @font-size-base;
font-weight: normal;
line-height: 18px;
background-color: @popover-title-bg; background-color: @popover-title-bg;
border-bottom: 1px solid darken(@popover-title-bg, 5%); border-bottom: 1px solid darken(@popover-title-bg, 5%);
border-radius: (@border-radius-large - 1) (@border-radius-large - 1) 0 0; border-radius: (@border-radius-large - 1) (@border-radius-large - 1) 0 0;
...@@ -129,5 +131,4 @@ ...@@ -129,5 +131,4 @@
bottom: -@popover-arrow-width; bottom: -@popover-arrow-width;
} }
} }
} }
// //
// Basic print styles // Basic print styles
// -------------------------------------------------- // --------------------------------------------------
// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css // Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css
@media print { @media print {
* { * {
text-shadow: none !important;
color: #000 !important; // Black prints faster: h5bp.com/s
background: transparent !important; background: transparent !important;
color: #000 !important; // Black prints faster: h5bp.com/s
box-shadow: none !important; box-shadow: none !important;
text-shadow: none !important;
} }
a, a,
...@@ -25,9 +24,10 @@ ...@@ -25,9 +24,10 @@
content: " (" attr(title) ")"; content: " (" attr(title) ")";
} }
// Don't show links for images, or javascript/internal links // Don't show links that are fragment identifiers,
a[href^="javascript:"]:after, // or use the `javascript:` pseudo protocol
a[href^="#"]:after { a[href^="#"]:after,
a[href^="javascript:"]:after {
content: ""; content: "";
} }
...@@ -72,12 +72,6 @@ ...@@ -72,12 +72,6 @@
.navbar { .navbar {
display: none; display: none;
} }
.table {
td,
th {
background-color: #fff !important;
}
}
.btn, .btn,
.dropup > .btn { .dropup > .btn {
> .caret { > .caret {
...@@ -90,6 +84,11 @@ ...@@ -90,6 +84,11 @@
.table { .table {
border-collapse: collapse !important; border-collapse: collapse !important;
td,
th {
background-color: #fff !important;
}
} }
.table-bordered { .table-bordered {
th, th,
...@@ -97,5 +96,4 @@ ...@@ -97,5 +96,4 @@
border: 1px solid #ddd !important; border: 1px solid #ddd !important;
} }
} }
} }
...@@ -369,12 +369,12 @@ ...@@ -369,12 +369,12 @@
// Inverted navbar // Inverted navbar
// Reset inverted navbar basics // Reset inverted navbar basics
@navbar-inverse-color: lighten(@gray-light, 12%); @navbar-inverse-color: lighten(@gray-light, 15%);
@navbar-inverse-bg: #222; @navbar-inverse-bg: #222;
@navbar-inverse-border: darken(@navbar-inverse-bg, 10%); @navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
// Inverted navbar links // Inverted navbar links
@navbar-inverse-link-color: @gray-light; @navbar-inverse-link-color: lighten(@gray-light, 15%);
@navbar-inverse-link-hover-color: #fff; @navbar-inverse-link-hover-color: #fff;
@navbar-inverse-link-hover-bg: transparent; @navbar-inverse-link-hover-bg: transparent;
@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color; @navbar-inverse-link-active-color: @navbar-inverse-link-hover-color;
...@@ -528,7 +528,7 @@ ...@@ -528,7 +528,7 @@
//** Popover arrow width //** Popover arrow width
@popover-arrow-width: 10px; @popover-arrow-width: 10px;
//** Popover arrow color //** Popover arrow color
@popover-arrow-color: #fff; @popover-arrow-color: @popover-bg;
//** Popover outer arrow width //** Popover outer arrow width
@popover-arrow-outer-width: (@popover-arrow-width + 1); @popover-arrow-outer-width: (@popover-arrow-width + 1);
...@@ -841,5 +841,3 @@ ...@@ -841,5 +841,3 @@
@dl-horizontal-offset: @component-offset-horizontal; @dl-horizontal-offset: @component-offset-horizontal;
//** Horizontal line color. //** Horizontal line color.
@hr-border: @gray-lighter; @hr-border: @gray-lighter;
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
}, },
"devDependencies": { "devDependencies": {
"btoa": "~1.1.2", "btoa": "~1.1.2",
"glob": "~4.0.4", "glob": "~4.0.5",
"grunt": "~0.4.5", "grunt": "~0.4.5",
"grunt-autoprefixer": "~1.0.0", "grunt-autoprefixer": "~1.0.1",
"grunt-banner": "~0.2.3", "grunt-banner": "~0.2.3",
"grunt-contrib-clean": "~0.6.0", "grunt-contrib-clean": "~0.6.0",
"grunt-contrib-concat": "~0.5.0", "grunt-contrib-concat": "~0.5.0",
...@@ -43,21 +43,21 @@ ...@@ -43,21 +43,21 @@
"grunt-contrib-cssmin": "~0.10.0", "grunt-contrib-cssmin": "~0.10.0",
"grunt-contrib-jade": "~0.12.0", "grunt-contrib-jade": "~0.12.0",
"grunt-contrib-jshint": "~0.10.0", "grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-less": "~0.11.3", "grunt-contrib-less": "~0.11.4",
"grunt-contrib-qunit": "~0.5.2", "grunt-contrib-qunit": "~0.5.2",
"grunt-contrib-uglify": "~0.5.0", "grunt-contrib-uglify": "~0.5.1",
"grunt-contrib-watch": "~0.6.1", "grunt-contrib-watch": "~0.6.1",
"grunt-csscomb": "~3.0.0", "grunt-csscomb": "~3.0.0",
"grunt-exec": "~0.4.6", "grunt-exec": "~0.4.6",
"grunt-html-validation": "~0.1.18", "grunt-html-validation": "~0.1.18",
"grunt-jekyll": "~0.4.2", "grunt-jekyll": "~0.4.2",
"grunt-jscs": "~0.6.1", "grunt-jscs": "~0.6.2",
"grunt-saucelabs": "~8.2.0", "grunt-saucelabs": "~8.3.1",
"grunt-sed": "~0.1.1", "grunt-sed": "~0.1.1",
"load-grunt-tasks": "~0.6.0", "load-grunt-tasks": "~0.6.0",
"markdown": "~0.5.0", "markdown": "~0.5.0",
"npm-shrinkwrap": "~3.1.6", "npm-shrinkwrap": "~3.1.8",
"time-grunt": "~0.4.0" "time-grunt": "~1.0.0"
}, },
"engines": { "engines": {
"node": "~0.10.1" "node": "~0.10.1"
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment