0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-15 15:29:22 +01:00

Merge branch 'v4-dev' into fix-travis-v4

This commit is contained in:
Thomas McDonald 2015-08-25 10:00:36 -07:00
commit 75374ce511
24 changed files with 133 additions and 137 deletions

3
.gitattributes vendored
View File

@ -3,8 +3,9 @@
*.html text eol=lf *.html text eol=lf
*.js text eol=lf *.js text eol=lf
*.json text eol=lf *.json text eol=lf
*.less text eol=lf
*.md text eol=lf *.md text eol=lf
*.rb text eol=lf
*.scss text eol=lf
*.svg text eol=lf *.svg text eol=lf
*.yml text eol=lf *.yml text eol=lf
# Don't diff or textually merge source maps # Don't diff or textually merge source maps

View File

@ -1,7 +1,7 @@
/*! /*!
* Bootstrap's Gruntfile * Bootstrap's Gruntfile
* http://getbootstrap.com * http://getbootstrap.com
* Copyright 2013-2014 Twitter, Inc. * Copyright 2013-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
@ -260,7 +260,7 @@ module.exports = function (grunt) {
options: { options: {
// TODO: disable `zeroUnits` optimization once clean-css 3.2 is released // TODO: disable `zeroUnits` optimization once clean-css 3.2 is released
// and then simplify the fix for https://github.com/twbs/bootstrap/issues/14837 accordingly // and then simplify the fix for https://github.com/twbs/bootstrap/issues/14837 accordingly
compatibility: 'ie8', compatibility: 'ie9',
keepSpecialComments: '*', keepSpecialComments: '*',
sourceMap: true, sourceMap: true,
noAdvanced: true noAdvanced: true
@ -336,8 +336,8 @@ module.exports = function (grunt) {
jekyll: { jekyll: {
options: { options: {
config: '_config.yml', bundleExec: true,
bundleExec: true config: '_config.yml'
}, },
docs: {}, docs: {},
github: { github: {
@ -351,7 +351,6 @@ module.exports = function (grunt) {
options: { options: {
ignore: [ ignore: [
'Element “img” is missing required attribute “src”.', 'Element “img” is missing required attribute “src”.',
'Bad value “X-UA-Compatible” for attribute “http-equiv” on element “meta”.',
'Attribute “autocomplete” not allowed on element “input” at this point.', 'Attribute “autocomplete” not allowed on element “input” at this point.',
'Attribute “autocomplete” not allowed on element “button” at this point.', 'Attribute “autocomplete” not allowed on element “button” at this point.',
'Element “div” not allowed as child of element “progress” in this context. (Suppressing further errors from this subtree.)', 'Element “div” not allowed as child of element “progress” in this context. (Suppressing further errors from this subtree.)',
@ -439,7 +438,7 @@ module.exports = function (grunt) {
require('time-grunt')(grunt); require('time-grunt')(grunt);
// Docs HTML validation task // Docs HTML validation task
grunt.registerTask('validate-html', ['jekyll:docs']); grunt.registerTask('validate-html', ['jekyll:docs', 'htmllint']);
var runSubset = function (subset) { var runSubset = function (subset) {
return !process.env.TWBS_TEST || process.env.TWBS_TEST === subset; return !process.env.TWBS_TEST || process.env.TWBS_TEST === subset;

View File

@ -230,8 +230,8 @@ th {
@media print { @media print {
*, *,
*:before, *::before,
*:after { *::after {
text-shadow: none !important; text-shadow: none !important;
-webkit-box-shadow: none !important; -webkit-box-shadow: none !important;
box-shadow: none !important; box-shadow: none !important;
@ -240,7 +240,7 @@ th {
a:visited { a:visited {
text-decoration: underline; text-decoration: underline;
} }
abbr[title]:after { abbr[title]::after {
content: " (" attr(title) ")"; content: " (" attr(title) ")";
} }
pre, pre,
@ -298,8 +298,8 @@ html {
} }
*, *,
*:before, *::before,
*:after { *::after {
-webkit-box-sizing: inherit; -webkit-box-sizing: inherit;
box-sizing: inherit; box-sizing: inherit;
} }
@ -584,7 +584,7 @@ mark,
margin-left: -1.875rem; margin-left: -1.875rem;
} }
.dl-horizontal:after { .dl-horizontal::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -615,7 +615,7 @@ mark,
color: #818a91; color: #818a91;
} }
.blockquote footer:before { .blockquote footer::before {
content: "\2014 \00A0"; content: "\2014 \00A0";
} }
@ -627,11 +627,11 @@ mark,
border-left: 0; border-left: 0;
} }
.blockquote-reverse footer:before { .blockquote-reverse footer::before {
content: ""; content: "";
} }
.blockquote-reverse footer:after { .blockquote-reverse footer::after {
content: "\00A0 \2014"; content: "\00A0 \2014";
} }
@ -736,7 +736,7 @@ pre code {
margin-left: auto; margin-left: auto;
} }
.container:after { .container::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -773,7 +773,7 @@ pre code {
margin-left: auto; margin-left: auto;
} }
.container-fluid:after { .container-fluid::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -784,7 +784,7 @@ pre code {
margin-left: -.9375rem; margin-left: -.9375rem;
} }
.row:after { .row::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -2949,7 +2949,7 @@ input[type="button"].btn-block {
position: relative; position: relative;
} }
.dropdown-toggle:after { .dropdown-toggle::after {
display: inline-block; display: inline-block;
width: 0; width: 0;
height: 0; height: 0;
@ -2965,6 +2965,11 @@ input[type="button"].btn-block {
outline: 0; outline: 0;
} }
.dropup .dropdown-toggle::after {
border-top: 0;
border-bottom: .3em solid;
}
.dropdown-menu { .dropdown-menu {
position: absolute; position: absolute;
top: 100%; top: 100%;
@ -3130,7 +3135,7 @@ input[type="button"].btn-block {
margin-left: -5px; margin-left: -5px;
} }
.btn-toolbar:after { .btn-toolbar::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -3222,7 +3227,7 @@ input[type="button"].btn-block {
max-width: 100%; max-width: 100%;
} }
.btn-group-vertical > .btn-group:after { .btn-group-vertical > .btn-group::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -3485,7 +3490,7 @@ input[type="button"].btn-block {
display: inline; display: inline;
} }
.c-inputs-stacked .c-input:after { .c-inputs-stacked .c-input::after {
display: block; display: block;
margin-bottom: .25rem; margin-bottom: .25rem;
content: ""; content: "";
@ -3514,8 +3519,6 @@ input[type="button"].btn-block {
.c-select:focus { .c-select:focus {
border-color: #51a7e8; border-color: #51a7e8;
outline: none; outline: none;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075), 0 0 5px rgba(81, 167, 232, .5);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075), 0 0 5px rgba(81, 167, 232, .5);
} }
.c-select::-ms-expand { .c-select::-ms-expand {
@ -3564,15 +3567,13 @@ input[type="button"].btn-block {
background-color: #fff; background-color: #fff;
border: .075rem solid #ddd; border: .075rem solid #ddd;
border-radius: .25rem; border-radius: .25rem;
-webkit-box-shadow: inset 0 .2rem .4rem rgba(0, 0, 0, .05);
box-shadow: inset 0 .2rem .4rem rgba(0, 0, 0, .05);
} }
.file-custom:after { .file-custom::after {
content: "Choose file..."; content: "Choose file...";
} }
.file-custom:before { .file-custom::before {
position: absolute; position: absolute;
top: -.075rem; top: -.075rem;
right: -.075rem; right: -.075rem;
@ -3589,11 +3590,6 @@ input[type="button"].btn-block {
border-radius: 0 .25rem .25rem 0; border-radius: 0 .25rem .25rem 0;
} }
.file input:focus ~ .file-custom {
-webkit-box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9;
box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9;
}
.nav { .nav {
padding-left: 0; padding-left: 0;
margin-bottom: 0; margin-bottom: 0;
@ -3629,7 +3625,7 @@ input[type="button"].btn-block {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
.nav-tabs:after { .nav-tabs::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -3729,7 +3725,7 @@ input[type="button"].btn-block {
padding: .5rem 1rem; padding: .5rem 1rem;
} }
.navbar:after { .navbar::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -3815,7 +3811,7 @@ input[type="button"].btn-block {
overflow: hidden; overflow: hidden;
} }
.navbar-divider:before { .navbar-divider::before {
content: "\00a0"; content: "\00a0";
} }
@ -3940,6 +3936,7 @@ input[type="button"].btn-block {
.card { .card {
position: relative; position: relative;
margin-bottom: .75rem; margin-bottom: .75rem;
background-color: #fff;
border: .0625rem solid #e5e5e5; border: .0625rem solid #e5e5e5;
border-radius: .25rem; border-radius: .25rem;
} }
@ -4156,7 +4153,7 @@ input[type="button"].btn-block {
display: inline-block; display: inline-block;
} }
.breadcrumb > li + li:before { .breadcrumb > li + li::before {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
color: #818a91; color: #818a91;
@ -4285,7 +4282,7 @@ input[type="button"].btn-block {
list-style: none; list-style: none;
} }
.pager:after { .pager::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -5161,7 +5158,7 @@ button.close {
border-bottom: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;
} }
.modal-header:after { .modal-header::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -5187,7 +5184,7 @@ button.close {
border-top: 1px solid #e5e5e5; border-top: 1px solid #e5e5e5;
} }
.modal-footer:after { .modal-footer::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -5381,8 +5378,8 @@ button.close {
border-bottom-width: 0; border-bottom-width: 0;
} }
.popover.popover-top .popover-arrow:after, .popover.popover-top .popover-arrow::after,
.popover.bs-tether-element-attached-bottom .popover-arrow:after { .popover.bs-tether-element-attached-bottom .popover-arrow::after {
bottom: 1px; bottom: 1px;
margin-left: -10px; margin-left: -10px;
content: ""; content: "";
@ -5404,8 +5401,8 @@ button.close {
border-left-width: 0; border-left-width: 0;
} }
.popover.popover-right .popover-arrow:after, .popover.popover-right .popover-arrow::after,
.popover.bs-tether-element-attached-left .popover-arrow:after { .popover.bs-tether-element-attached-left .popover-arrow::after {
bottom: -10px; bottom: -10px;
left: 1px; left: 1px;
content: ""; content: "";
@ -5427,8 +5424,8 @@ button.close {
border-bottom-color: rgba(0, 0, 0, .25); border-bottom-color: rgba(0, 0, 0, .25);
} }
.popover.popover-bottom .popover-arrow:after, .popover.popover-bottom .popover-arrow::after,
.popover.bs-tether-element-attached-top .popover-arrow:after { .popover.bs-tether-element-attached-top .popover-arrow::after {
top: 1px; top: 1px;
margin-left: -10px; margin-left: -10px;
content: ""; content: "";
@ -5450,8 +5447,8 @@ button.close {
border-left-color: rgba(0, 0, 0, .25); border-left-color: rgba(0, 0, 0, .25);
} }
.popover.popover-left .popover-arrow:after, .popover.popover-left .popover-arrow::after,
.popover.bs-tether-element-attached-right .popover-arrow:after { .popover.bs-tether-element-attached-right .popover-arrow::after {
right: 1px; right: 1px;
bottom: -10px; bottom: -10px;
content: ""; content: "";
@ -5473,7 +5470,7 @@ button.close {
} }
.popover-arrow, .popover-arrow,
.popover-arrow:after { .popover-arrow::after {
position: absolute; position: absolute;
display: block; display: block;
width: 0; width: 0;
@ -5486,7 +5483,7 @@ button.close {
border-width: 11px; border-width: 11px;
} }
.popover-arrow:after { .popover-arrow::after {
content: ""; content: "";
border-width: 10px; border-width: 10px;
} }
@ -5648,11 +5645,11 @@ button.close {
margin-right: -10px; margin-right: -10px;
} }
.carousel-control .icon-prev:before { .carousel-control .icon-prev::before {
content: "\2039"; content: "\2039";
} }
.carousel-control .icon-next:before { .carousel-control .icon-next::before {
content: "\203a"; content: "\203a";
} }
@ -5728,7 +5725,7 @@ button.close {
} }
} }
.clearfix:after { .clearfix::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -3,8 +3,8 @@
<ul class="bd-footer-links"> <ul class="bd-footer-links">
<li><a href="{{ site.repo }}">GitHub</a></li> <li><a href="{{ site.repo }}">GitHub</a></li>
<li><a href="https://twitter.com/getbootstrap">Twitter</a></li> <li><a href="https://twitter.com/getbootstrap">Twitter</a></li>
<li><a href="../getting-started/#examples">Examples</a></li> <li><a href="{{ site.baseurl }}/examples/">Examples</a></li>
<li><a href="../about/">About</a></li> <li><a href="{{ site.baseurl }}/about/history/">About</a></li>
</ul> </ul>
<p>Designed and built with all the love in the world by <a href="https://twitter.com/mdo" target="_blank">@mdo</a> and <a href="https://twitter.com/fat" target="_blank">@fat</a>. Maintained by the <a href="https://github.com/orgs/twbs/people">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p> <p>Designed and built with all the love in the world by <a href="https://twitter.com/mdo" target="_blank">@mdo</a> and <a href="https://twitter.com/fat" target="_blank">@fat</a>. Maintained by the <a href="https://github.com/orgs/twbs/people">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p>
<p>Currently v{{ site.current_version }}. Code licensed <a rel="license" href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, docs <a rel="license" href="https://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.</p> <p>Currently v{{ site.current_version }}. Code licensed <a rel="license" href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, docs <a rel="license" href="https://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.</p>

View File

@ -16,7 +16,7 @@
{% elsif page.group == "components" %} {% elsif page.group == "components" %}
<h1>Components</h1> <h1>Components</h1>
<p class="lead"> <p class="lead">
Over a dozen reusable components built to provide iconography, dropdowns, input groups, navigation, alerts, and much more. Over a dozen reusable components built to provide buttons, dropdowns, input groups, navigation, alerts, and much more.
</p> </p>
{% elsif page.group == "javascript" %} {% elsif page.group == "javascript" %}
<h1>JavaScript plugins</h1> <h1>JavaScript plugins</h1>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
/*! /*!
* Bootstrap Docs (http://getbootstrap.com) * Bootstrap Docs (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under the Creative Commons Attribution 3.0 Unported License. For * Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see http://creativecommons.org/licenses/by/3.0/. * details, see http://creativecommons.org/licenses/by/3.0/.
*/ */

View File

@ -4,7 +4,7 @@ title: Dropdowns
group: components group: components
--- ---
Dropdowns are toggleable, contextual overlays for displaying lists of links and more. They're made interactive with the included Bootstrap dropdown JavaScript plugin. Dropdowns are toggleable, contextual overlays for displaying lists of links and more. They're made interactive with the included Bootstrap dropdown JavaScript plugin. They're toggled by clicking, not by hovering; this is [an intentional design decision.](http://markdotto.com/2012/02/27/bootstrap-explained-dropdowns/)
## Contents ## Contents
@ -34,10 +34,10 @@ You can optionally use `<button>` elements in your dropdowns instead of `<a>`s.
{% example html %} {% example html %}
<div class="dropdown open"> <div class="dropdown open">
<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Dropdown Dropdown
</button> </button>
<div class="dropdown-menu" aria-labelledby="dropdownMenu1"> <div class="dropdown-menu" aria-labelledby="dropdownMenu2">
<button class="dropdown-item" type="button">Action</button> <button class="dropdown-item" type="button">Action</button>
<button class="dropdown-item" type="button">Another action</button> <button class="dropdown-item" type="button">Another action</button>
<button class="dropdown-item" type="button">Something else here</button> <button class="dropdown-item" type="button">Something else here</button>

View File

@ -230,8 +230,8 @@ th {
@media print { @media print {
*, *,
*:before, *::before,
*:after { *::after {
text-shadow: none !important; text-shadow: none !important;
-webkit-box-shadow: none !important; -webkit-box-shadow: none !important;
box-shadow: none !important; box-shadow: none !important;
@ -240,7 +240,7 @@ th {
a:visited { a:visited {
text-decoration: underline; text-decoration: underline;
} }
abbr[title]:after { abbr[title]::after {
content: " (" attr(title) ")"; content: " (" attr(title) ")";
} }
pre, pre,
@ -298,8 +298,8 @@ html {
} }
*, *,
*:before, *::before,
*:after { *::after {
-webkit-box-sizing: inherit; -webkit-box-sizing: inherit;
box-sizing: inherit; box-sizing: inherit;
} }
@ -584,7 +584,7 @@ mark,
margin-left: -1.875rem; margin-left: -1.875rem;
} }
.dl-horizontal:after { .dl-horizontal::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -615,7 +615,7 @@ mark,
color: #818a91; color: #818a91;
} }
.blockquote footer:before { .blockquote footer::before {
content: "\2014 \00A0"; content: "\2014 \00A0";
} }
@ -627,11 +627,11 @@ mark,
border-left: 0; border-left: 0;
} }
.blockquote-reverse footer:before { .blockquote-reverse footer::before {
content: ""; content: "";
} }
.blockquote-reverse footer:after { .blockquote-reverse footer::after {
content: "\00A0 \2014"; content: "\00A0 \2014";
} }
@ -736,7 +736,7 @@ pre code {
margin-left: auto; margin-left: auto;
} }
.container:after { .container::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -773,7 +773,7 @@ pre code {
margin-left: auto; margin-left: auto;
} }
.container-fluid:after { .container-fluid::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -784,7 +784,7 @@ pre code {
margin-left: -.9375rem; margin-left: -.9375rem;
} }
.row:after { .row::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -2949,7 +2949,7 @@ input[type="button"].btn-block {
position: relative; position: relative;
} }
.dropdown-toggle:after { .dropdown-toggle::after {
display: inline-block; display: inline-block;
width: 0; width: 0;
height: 0; height: 0;
@ -2965,6 +2965,11 @@ input[type="button"].btn-block {
outline: 0; outline: 0;
} }
.dropup .dropdown-toggle::after {
border-top: 0;
border-bottom: .3em solid;
}
.dropdown-menu { .dropdown-menu {
position: absolute; position: absolute;
top: 100%; top: 100%;
@ -3130,7 +3135,7 @@ input[type="button"].btn-block {
margin-left: -5px; margin-left: -5px;
} }
.btn-toolbar:after { .btn-toolbar::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -3222,7 +3227,7 @@ input[type="button"].btn-block {
max-width: 100%; max-width: 100%;
} }
.btn-group-vertical > .btn-group:after { .btn-group-vertical > .btn-group::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -3485,7 +3490,7 @@ input[type="button"].btn-block {
display: inline; display: inline;
} }
.c-inputs-stacked .c-input:after { .c-inputs-stacked .c-input::after {
display: block; display: block;
margin-bottom: .25rem; margin-bottom: .25rem;
content: ""; content: "";
@ -3514,8 +3519,6 @@ input[type="button"].btn-block {
.c-select:focus { .c-select:focus {
border-color: #51a7e8; border-color: #51a7e8;
outline: none; outline: none;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075), 0 0 5px rgba(81, 167, 232, .5);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075), 0 0 5px rgba(81, 167, 232, .5);
} }
.c-select::-ms-expand { .c-select::-ms-expand {
@ -3564,15 +3567,13 @@ input[type="button"].btn-block {
background-color: #fff; background-color: #fff;
border: .075rem solid #ddd; border: .075rem solid #ddd;
border-radius: .25rem; border-radius: .25rem;
-webkit-box-shadow: inset 0 .2rem .4rem rgba(0, 0, 0, .05);
box-shadow: inset 0 .2rem .4rem rgba(0, 0, 0, .05);
} }
.file-custom:after { .file-custom::after {
content: "Choose file..."; content: "Choose file...";
} }
.file-custom:before { .file-custom::before {
position: absolute; position: absolute;
top: -.075rem; top: -.075rem;
right: -.075rem; right: -.075rem;
@ -3589,11 +3590,6 @@ input[type="button"].btn-block {
border-radius: 0 .25rem .25rem 0; border-radius: 0 .25rem .25rem 0;
} }
.file input:focus ~ .file-custom {
-webkit-box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9;
box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9;
}
.nav { .nav {
padding-left: 0; padding-left: 0;
margin-bottom: 0; margin-bottom: 0;
@ -3629,7 +3625,7 @@ input[type="button"].btn-block {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
.nav-tabs:after { .nav-tabs::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -3729,7 +3725,7 @@ input[type="button"].btn-block {
padding: .5rem 1rem; padding: .5rem 1rem;
} }
.navbar:after { .navbar::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -3815,7 +3811,7 @@ input[type="button"].btn-block {
overflow: hidden; overflow: hidden;
} }
.navbar-divider:before { .navbar-divider::before {
content: "\00a0"; content: "\00a0";
} }
@ -3940,6 +3936,7 @@ input[type="button"].btn-block {
.card { .card {
position: relative; position: relative;
margin-bottom: .75rem; margin-bottom: .75rem;
background-color: #fff;
border: .0625rem solid #e5e5e5; border: .0625rem solid #e5e5e5;
border-radius: .25rem; border-radius: .25rem;
} }
@ -4156,7 +4153,7 @@ input[type="button"].btn-block {
display: inline-block; display: inline-block;
} }
.breadcrumb > li + li:before { .breadcrumb > li + li::before {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
color: #818a91; color: #818a91;
@ -4285,7 +4282,7 @@ input[type="button"].btn-block {
list-style: none; list-style: none;
} }
.pager:after { .pager::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -5161,7 +5158,7 @@ button.close {
border-bottom: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;
} }
.modal-header:after { .modal-header::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -5187,7 +5184,7 @@ button.close {
border-top: 1px solid #e5e5e5; border-top: 1px solid #e5e5e5;
} }
.modal-footer:after { .modal-footer::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";
@ -5381,8 +5378,8 @@ button.close {
border-bottom-width: 0; border-bottom-width: 0;
} }
.popover.popover-top .popover-arrow:after, .popover.popover-top .popover-arrow::after,
.popover.bs-tether-element-attached-bottom .popover-arrow:after { .popover.bs-tether-element-attached-bottom .popover-arrow::after {
bottom: 1px; bottom: 1px;
margin-left: -10px; margin-left: -10px;
content: ""; content: "";
@ -5404,8 +5401,8 @@ button.close {
border-left-width: 0; border-left-width: 0;
} }
.popover.popover-right .popover-arrow:after, .popover.popover-right .popover-arrow::after,
.popover.bs-tether-element-attached-left .popover-arrow:after { .popover.bs-tether-element-attached-left .popover-arrow::after {
bottom: -10px; bottom: -10px;
left: 1px; left: 1px;
content: ""; content: "";
@ -5427,8 +5424,8 @@ button.close {
border-bottom-color: rgba(0, 0, 0, .25); border-bottom-color: rgba(0, 0, 0, .25);
} }
.popover.popover-bottom .popover-arrow:after, .popover.popover-bottom .popover-arrow::after,
.popover.bs-tether-element-attached-top .popover-arrow:after { .popover.bs-tether-element-attached-top .popover-arrow::after {
top: 1px; top: 1px;
margin-left: -10px; margin-left: -10px;
content: ""; content: "";
@ -5450,8 +5447,8 @@ button.close {
border-left-color: rgba(0, 0, 0, .25); border-left-color: rgba(0, 0, 0, .25);
} }
.popover.popover-left .popover-arrow:after, .popover.popover-left .popover-arrow::after,
.popover.bs-tether-element-attached-right .popover-arrow:after { .popover.bs-tether-element-attached-right .popover-arrow::after {
right: 1px; right: 1px;
bottom: -10px; bottom: -10px;
content: ""; content: "";
@ -5473,7 +5470,7 @@ button.close {
} }
.popover-arrow, .popover-arrow,
.popover-arrow:after { .popover-arrow::after {
position: absolute; position: absolute;
display: block; display: block;
width: 0; width: 0;
@ -5486,7 +5483,7 @@ button.close {
border-width: 11px; border-width: 11px;
} }
.popover-arrow:after { .popover-arrow::after {
content: ""; content: "";
border-width: 10px; border-width: 10px;
} }
@ -5648,11 +5645,11 @@ button.close {
margin-right: -10px; margin-right: -10px;
} }
.carousel-control .icon-prev:before { .carousel-control .icon-prev::before {
content: "\2039"; content: "\2039";
} }
.carousel-control .icon-next:before { .carousel-control .icon-next::before {
content: "\203a"; content: "\203a";
} }
@ -5728,7 +5725,7 @@ button.close {
} }
} }
.clearfix:after { .clearfix::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -92,6 +92,8 @@ Similarly, the latest versions of most desktop browsers are supported.
</table> </table>
</div> </div>
For Firefox, in addition to the latest normal stable release, we also support the latest [Extended Support Release (ESR)](https://www.mozilla.org/en-US/firefox/organizations/faq/) version of Firefox.
Unofficially, Bootstrap should look and behave well enough in Chromium and Chrome for Linux, Firefox for Linux, and Internet Explorer 8 and below, though they are not officially supported. Unofficially, Bootstrap should look and behave well enough in Chromium and Chrome for Linux, Firefox for Linux, and Internet Explorer 8 and below, though they are not officially supported.
For a list of some of the browser bugs that Bootstrap has to grapple with, see our [Wall of browser bugs]({{ site.baseurl }}/browser-bugs/). For a list of some of the browser bugs that Bootstrap has to grapple with, see our [Wall of browser bugs]({{ site.baseurl }}/browser-bugs/).

View File

@ -16,7 +16,7 @@ module.exports = function generateCommonJSModule(grunt, srcFiles, destFilepath)
var destDir = path.dirname(destFilepath); var destDir = path.dirname(destFilepath);
function srcPathToDestRequire(srcFilepath) { function srcPathToDestRequire(srcFilepath) {
return 'require(\'' + srcFilepath + '\')'; return 'require(\'' + srcFilepath.replace(/\\/g, '/') + '\')';
} }
var moduleOutputJs = COMMONJS_BANNER + srcFiles.map(srcPathToDestRequire).join('\n'); var moduleOutputJs = COMMONJS_BANNER + srcFiles.map(srcPathToDestRequire).join('\n');

View File

@ -15,7 +15,7 @@
"Android >= 4", "Android >= 4",
"Chrome >= 20", "Chrome >= 20",
"Firefox >= 24", "Firefox >= 24",
"Explorer >= 8", "Explorer >= 9",
"iOS >= 6", "iOS >= 6",
"Opera >= 12", "Opera >= 12",
"Safari >= 6" "Safari >= 6"

View File

@ -15,8 +15,8 @@
"no-dupe-args": 2, "no-dupe-args": 2,
"no-dupe-keys": 2, "no-dupe-keys": 2,
"no-duplicate-case": 2, "no-duplicate-case": 2,
"no-empty-character-class": 2,
"no-empty": 2, "no-empty": 2,
"no-empty-character-class": 2,
"no-ex-assign": 2, "no-ex-assign": 2,
"no-extra-boolean-cast": 2, "no-extra-boolean-cast": 2,
"no-extra-parens": 0, "no-extra-parens": 0,
@ -29,11 +29,11 @@
"no-obj-calls": 2, "no-obj-calls": 2,
"no-regex-spaces": 2, "no-regex-spaces": 2,
"no-sparse-arrays": 2, "no-sparse-arrays": 2,
"no-unexpected-multiline": 2,
"no-unreachable": 2, "no-unreachable": 2,
"use-isnan": 2, "use-isnan": 2,
"valid-jsdoc": 0, "valid-jsdoc": 0,
"valid-typeof": 2, "valid-typeof": 2,
"no-unexpected-multiline": 2,
//Best Practices //Best Practices
"accessor-pairs": 2, "accessor-pairs": 2,
@ -41,8 +41,8 @@
"consistent-return": 2, "consistent-return": 2,
"curly": 2, "curly": 2,
"default-case": 2, "default-case": 2,
"dot-notation": 0,
"dot-location": 0, "dot-location": 0,
"dot-notation": 0,
"eqeqeq": 2, "eqeqeq": 2,
"guard-for-in": 2, "guard-for-in": 2,
"no-alert": 2, "no-alert": 2,
@ -66,11 +66,11 @@
"no-multi-spaces": 0, "no-multi-spaces": 0,
"no-multi-str": 0, "no-multi-str": 0,
"no-native-reassign": 2, "no-native-reassign": 2,
"no-new": 2,
"no-new-func": 0, "no-new-func": 0,
"no-new-wrappers": 2, "no-new-wrappers": 2,
"no-new": 2,
"no-octal-escape": 2,
"no-octal": 2, "no-octal": 2,
"no-octal-escape": 2,
"no-param-reassign": 0, "no-param-reassign": 0,
"no-process-env": 2, "no-process-env": 2,
"no-proto": 2, "no-proto": 2,
@ -95,11 +95,11 @@
"no-catch-shadow": 2, "no-catch-shadow": 2,
"no-delete-var": 2, "no-delete-var": 2,
"no-label-var": 2, "no-label-var": 2,
"no-shadow-restricted-names": 2,
"no-shadow": 0, "no-shadow": 0,
"no-undef-init": 2, "no-shadow-restricted-names": 2,
"no-undef": 0, "no-undef": 0,
"no-undefined": 0, "no-undefined": 0,
"no-undef-init": 2,
"no-unused-vars": 2, "no-unused-vars": 2,
"no-use-before-define": 0, "no-use-before-define": 0,
@ -117,11 +117,11 @@
"func-style": 0, "func-style": 0,
"indent": 0, "indent": 0,
"key-spacing": 0, "key-spacing": 0,
"lines-around-comment": 0,
"linebreak-style": 2, "linebreak-style": 2,
"lines-around-comment": 0,
"new-cap": 0, "new-cap": 0,
"new-parens": 2,
"newline-after-var": 0, "newline-after-var": 0,
"new-parens": 2,
"no-array-constructor": 2, "no-array-constructor": 2,
"no-continue": 0, "no-continue": 0,
"no-inline-comments": 0, "no-inline-comments": 0,
@ -142,17 +142,17 @@
"padded-blocks": 0, "padded-blocks": 0,
"quote-props": 0, "quote-props": 0,
"quotes": 0, "quotes": 0,
"semi-spacing": 0,
"semi": [2, "never"], "semi": [2, "never"],
"semi-spacing": 0,
"sort-vars": 2, "sort-vars": 2,
"space-after-keywords": 2, "space-after-keywords": 2,
"space-before-blocks": 2, "space-before-blocks": 2,
"space-before-function-paren": 0, "space-before-function-paren": 0,
"space-in-parens": 2, "spaced-comment": 2,
"space-infix-ops": 2, "space-infix-ops": 2,
"space-in-parens": 2,
"space-return-throw-case": 2, "space-return-throw-case": 2,
"space-unary-ops": 2, "space-unary-ops": 2,
"spaced-comment": 2,
// es6 // es6
"arrow-parens": 2, "arrow-parens": 2,
@ -167,8 +167,8 @@
"object-shorthand": 2, "object-shorthand": 2,
"prefer-arrow-callback": 2, "prefer-arrow-callback": 2,
"prefer-const": 0, "prefer-const": 0,
"prefer-spread": 2,
"prefer-reflect": 0, "prefer-reflect": 0,
"prefer-spread": 2,
"prefer-template": 2, "prefer-template": 2,
"require-yield": 2 "require-yield": 2

View File

@ -27,8 +27,8 @@
.dropup { .dropup {
.dropdown-toggle { .dropdown-toggle {
&::after { &::after {
border-bottom: $caret-width solid;
border-top: 0; border-top: 0;
border-bottom: $caret-width solid;
} }
} }
} }

View File

@ -19,7 +19,7 @@
// Short retina mixin for setting background-image and -size. // Short retina mixin for setting background-image and -size.
@mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) { @mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) {
background-image: url("#{file-1x}"); background-image: url($file-1x);
@media @media
only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (-webkit-min-device-pixel-ratio: 2),
@ -27,7 +27,7 @@
only screen and ( min-device-pixel-ratio: 2), only screen and ( min-device-pixel-ratio: 2),
only screen and ( min-resolution: 192dpi), only screen and ( min-resolution: 192dpi),
only screen and ( min-resolution: 2dppx) { only screen and ( min-resolution: 2dppx) {
background-image: url("#{file-2x}"); background-image: url($file-2x);
background-size: $width-1x $height-1x; background-size: $width-1x $height-1x;
} }
} }