0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00

Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

This commit is contained in:
Mark Otto 2015-11-29 19:54:20 -08:00
commit 0fa2c7c486
31 changed files with 218 additions and 172 deletions

View File

@ -23,19 +23,33 @@ module.exports = function (grunt) {
var mq4HoverShim = require('mq4-hover-shim');
var autoprefixer = require('autoprefixer')({
browsers: [
'Android 2.3',
'Android >= 4',
'Chrome >= 35',
'Firefox >= 31',
//
// Official browser support policy:
// http://v4-alpha.getbootstrap.com/getting-started/browsers-devices/#supported-browsers
//
'Chrome >= 35', // Exact version number here is kinda arbitrary
// Rather than using Autoprefixer's native "Firefox ESR" version specifier string,
// we deliberately hardcode the number. This is to avoid unwittingly severely breaking the previous ESR in the event that:
// (a) we happen to ship a new Bootstrap release soon after the release of a new ESR,
// such that folks haven't yet had a reasonable amount of time to upgrade; and
// (b) the new ESR has unprefixed CSS properties/values whose absence would severely break webpages
// (e.g. `box-sizing`, as opposed to `background: linear-gradient(...)`).
// Since they've been unprefixed, Autoprefixer will stop prefixing them,
// thus causing them to not work in the previous ESR (where the prefixes were required).
'Firefox >= 31', // Current Firefox Extended Support Release (ESR)
// Note: Edge versions in Autoprefixer & Can I Use refer to the EdgeHTML rendering engine version,
// NOT the Edge app version shown in Edge's "About" screen.
// For example, at the time of writing, Edge 20 on an up-to-date system uses EdgeHTML 12.
// See also https://github.com/Fyrd/caniuse/issues/1928
'Edge >= 12',
'Explorer >= 9',
// Out of leniency, we prefix these 1 version further back than the official policy.
'iOS >= 7',
'Opera >= 12',
'Safari >= 7.1'
'Safari >= 7.1',
// The following remain NOT officially supported, but we're lenient and include their prefixes to avoid severely breaking in them.
'Android 2.3',
'Android >= 4',
'Opera >= 12'
]
});

View File

@ -3154,6 +3154,10 @@ input[type="button"].btn-block {
margin-bottom: 0;
}
.input-group .form-control:focus, .input-group .form-control:active, .input-group .form-control:hover {
z-index: 3;
}
.input-group-addon,
.input-group-btn,
.input-group .form-control {
@ -3251,7 +3255,7 @@ input[type="button"].btn-block {
}
.input-group-btn > .btn:focus, .input-group-btn > .btn:active, .input-group-btn > .btn:hover {
z-index: 2;
z-index: 3;
}
.input-group-btn:first-child > .btn,
@ -3265,6 +3269,13 @@ input[type="button"].btn-block {
margin-left: -1px;
}
.input-group-btn:last-child > .btn:focus, .input-group-btn:last-child > .btn:active, .input-group-btn:last-child > .btn:hover,
.input-group-btn:last-child > .btn-group:focus,
.input-group-btn:last-child > .btn-group:active,
.input-group-btn:last-child > .btn-group:hover {
z-index: 3;
}
.c-input {
position: relative;
display: inline;
@ -4273,16 +4284,16 @@ a.label:focus, a.label:hover {
border-radius: .3rem;
}
.jumbotron-hr {
border-top-color: #d0d5d8;
}
@media (min-width: 544px) {
.jumbotron {
padding: 4rem 2rem;
}
}
.jumbotron-hr {
border-top-color: #d0d5d8;
}
.jumbotron-fluid {
padding-right: 0;
padding-left: 0;
@ -5579,18 +5590,6 @@ button.close {
border: 0;
}
.text-left {
text-align: left !important;
}
.text-right {
text-align: right !important;
}
.text-center {
text-align: center !important;
}
.text-justify {
text-align: justify !important;
}

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

@ -130,13 +130,13 @@ You can quickly change the text alignment of any card—in its entirety or speci
<a href="#" class="btn btn-primary">Go somewhere</a>
</div>
<div class="card card-block text-center">
<div class="card card-block text-xs-center">
<h4 class="card-title">Special title treatment</h4>
<p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
<a href="#" class="btn btn-primary">Go somewhere</a>
</div>
<div class="card card-block text-right">
<div class="card card-block text-xs-right">
<h4 class="card-title">Special title treatment</h4>
<p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
<a href="#" class="btn btn-primary">Go somewhere</a>
@ -186,7 +186,7 @@ Add an optional header and/or footer within a card.
{% endexample %}
{% example html %}
<div class="card text-center">
<div class="card text-xs-center">
<div class="card-header">
Featured
</div>
@ -260,7 +260,7 @@ You can also use `.card-inverse` with the [contextual backgrounds variants](#bac
Cards include their own variant classes for quickly changing the `background-color` and `border-color` of a card. **Darker colors require the use of `.card-inverse`.**
{% example html %}
<div class="card card-inverse card-primary text-center">
<div class="card card-inverse card-primary text-xs-center">
<div class="card-block">
<blockquote class="card-blockquote">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
@ -268,7 +268,7 @@ Cards include their own variant classes for quickly changing the `background-col
</blockquote>
</div>
</div>
<div class="card card-inverse card-success text-center">
<div class="card card-inverse card-success text-xs-center">
<div class="card-block">
<blockquote class="card-blockquote">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
@ -276,7 +276,7 @@ Cards include their own variant classes for quickly changing the `background-col
</blockquote>
</div>
</div>
<div class="card card-inverse card-info text-center">
<div class="card card-inverse card-info text-xs-center">
<div class="card-block">
<blockquote class="card-blockquote">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
@ -284,7 +284,7 @@ Cards include their own variant classes for quickly changing the `background-col
</blockquote>
</div>
</div>
<div class="card card-inverse card-warning text-center">
<div class="card card-inverse card-warning text-xs-center">
<div class="card-block">
<blockquote class="card-blockquote">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
@ -292,7 +292,7 @@ Cards include their own variant classes for quickly changing the `background-col
</blockquote>
</div>
</div>
<div class="card card-inverse card-danger text-center">
<div class="card card-inverse card-danger text-xs-center">
<div class="card-block">
<blockquote class="card-blockquote">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
@ -409,7 +409,7 @@ Cards can be organized into [Masonry](http://masonry.desandro.com)-like columns
<p class="card-text"><small class="text-muted">Last updated 3 mins ago</small></p>
</div>
</div>
<div class="card card-block card-inverse card-primary text-center">
<div class="card card-block card-inverse card-primary text-xs-center">
<blockquote class="card-blockquote">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat.</p>
<footer>
@ -419,7 +419,7 @@ Cards can be organized into [Masonry](http://masonry.desandro.com)-like columns
</footer>
</blockquote>
</div>
<div class="card card-block text-center">
<div class="card card-block text-xs-center">
<h4 class="card-title">Card title</h4>
<p class="card-text">This card has supporting text below as a natural lead-in to additional content.</p>
<p class="card-text"><small class="text-muted">Last updated 3 mins ago</small></p>
@ -427,7 +427,7 @@ Cards can be organized into [Masonry](http://masonry.desandro.com)-like columns
<div class="card">
<img class="card-img" data-src="holder.js/100px260/" alt="Card image">
</div>
<div class="card card-block text-right">
<div class="card card-block text-xs-right">
<blockquote class="card-blockquote">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
<footer>

View File

@ -94,13 +94,23 @@ Assign `margin` or `padding` to an element or a subset of its sides with shortha
Easily realign text to components with text alignment classes.
{% example html %}
<p class="text-left">Left aligned text.</p>
<p class="text-center">Center aligned text.</p>
<p class="text-right">Right aligned text.</p>
<p class="text-justify">Justified text.</p>
<p class="text-nowrap">No wrap text.</p>
{% endexample %}
For left, right, and center alignment, responsive classes are available that use the same viewport width breakpoints as the grid system.
{% example html %}
<p class="text-xs-left">Left aligned text on all viewport sizes.</p>
<p class="text-xs-center">Center aligned text on all viewport sizes.</p>
<p class="text-xs-right">Right aligned text on all viewport sizes.</p>
<p class="text-sm-left">Left aligned text on viewports sized SM (small) or wider.</p>
<p class="text-md-left">Left aligned text on viewports sized MD (medium) or wider.</p>
<p class="text-lg-left">Left aligned text on viewports sized LG (large) or wider.</p>
<p class="text-xl-left">Left aligned text on viewports sized XL (extra-large) or wider.</p>
{% endexample %}
## Text transform
Transform text in components with text capitalization classes.

View File

@ -20,6 +20,6 @@ Aligning the figure's caption is easy with our [text utilities]({{ site.baseurl
{% example html %}
<figure class="figure">
<img data-src="holder.js/400x300" class="figure-img img-fluid img-rounded" alt="A generic square placeholder image with rounded corners in a figure.">
<figcaption class="figure-caption text-right">A caption for the above image.</figcaption>
<figcaption class="figure-caption text-xs-right">A caption for the above image.</figcaption>
</figure>
{% endexample %}

View File

@ -68,13 +68,13 @@ Align images with the [helper float classes]({{ site.baseurl }}/components/utili
{% endhighlight %}
<div class="bd-example bd-example-images">
<div class="text-center">
<div class="text-xs-center">
<img data-src="holder.js/200x200" class="img-rounded" alt="A generic square placeholder image with rounded corners">
</div>
</div>
{% highlight html %}
<div class="text-center">
<div class="text-xs-center">
<img src="..." class="img-rounded" alt="...">
</div>
{% endhighlight %}

View File

@ -3154,6 +3154,10 @@ input[type="button"].btn-block {
margin-bottom: 0;
}
.input-group .form-control:focus, .input-group .form-control:active, .input-group .form-control:hover {
z-index: 3;
}
.input-group-addon,
.input-group-btn,
.input-group .form-control {
@ -3251,7 +3255,7 @@ input[type="button"].btn-block {
}
.input-group-btn > .btn:focus, .input-group-btn > .btn:active, .input-group-btn > .btn:hover {
z-index: 2;
z-index: 3;
}
.input-group-btn:first-child > .btn,
@ -3265,6 +3269,13 @@ input[type="button"].btn-block {
margin-left: -1px;
}
.input-group-btn:last-child > .btn:focus, .input-group-btn:last-child > .btn:active, .input-group-btn:last-child > .btn:hover,
.input-group-btn:last-child > .btn-group:focus,
.input-group-btn:last-child > .btn-group:active,
.input-group-btn:last-child > .btn-group:hover {
z-index: 3;
}
.c-input {
position: relative;
display: inline;
@ -4273,16 +4284,16 @@ a.label:focus, a.label:hover {
border-radius: .3rem;
}
.jumbotron-hr {
border-top-color: #d0d5d8;
}
@media (min-width: 544px) {
.jumbotron {
padding: 4rem 2rem;
}
}
.jumbotron-hr {
border-top-color: #d0d5d8;
}
.jumbotron-fluid {
padding-right: 0;
padding-left: 0;
@ -5579,18 +5590,6 @@ button.close {
border: 0;
}
.text-left {
text-align: left !important;
}
.text-right {
text-align: right !important;
}
.text-center {
text-align: center !important;
}
.text-justify {
text-align: justify !important;
}

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

@ -44,7 +44,7 @@
</div>
</div>
<section class="jumbotron text-center">
<section class="jumbotron text-xs-center">
<div class="container">
<h1 class="jumbotron-heading">Album example</h1>
<p class="lead text-muted">Something short and leading about the collection below—its contents, the creator, etc. Make it short and sweet, but not too short so folks don't simply skip over it entirely.</p>

View File

@ -51,7 +51,7 @@
<div class="carousel-item active">
<img class="first-slide" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="First slide">
<div class="container">
<div class="carousel-caption text-left">
<div class="carousel-caption text-xs-left">
<h1>Example headline.</h1>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<p><a class="btn btn-lg btn-primary" href="#" role="button">Sign up today</a></p>
@ -71,7 +71,7 @@
<div class="carousel-item">
<img class="third-slide" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Third slide">
<div class="container">
<div class="carousel-caption text-right">
<div class="carousel-caption text-xs-right">
<h1>One more for good measure.</h1>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<p><a class="btn btn-lg btn-primary" href="#" role="button">Browse gallery</a></p>

View File

@ -62,23 +62,23 @@ See how aspects of the Bootstrap grid system work across multiple devices with a
<thead>
<tr>
<th></th>
<th class="text-center">
<th class="text-xs-center">
Extra small<br>
<small>&lt;544px</small>
</th>
<th class="text-center">
<th class="text-xs-center">
Small<br>
<small>&ge;544px</small>
</th>
<th class="text-center">
<th class="text-xs-center">
Medium<br>
<small>&ge;768px</small>
</th>
<th class="text-center">
<th class="text-xs-center">
Large<br>
<small>&ge;992px</small>
</th>
<th class="text-center">
<th class="text-xs-center">
Extra large<br>
<small>&ge;1200px</small>
</th>

View File

@ -159,8 +159,8 @@
"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.34.tgz"
},
"babel-eslint": {
"version": "4.1.5",
"resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-4.1.5.tgz"
"version": "4.1.6",
"resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-4.1.6.tgz"
},
"babel-jscs": {
"version": "2.0.5",
@ -231,8 +231,8 @@
"resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.34.tgz"
},
"balanced-match": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
},
"basic-auth": {
"version": "1.0.3",
@ -265,8 +265,8 @@
"resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
},
"brace-expansion": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz"
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz"
},
"breakable": {
"version": "1.0.0",
@ -311,8 +311,8 @@
"resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz"
},
"caniuse-db": {
"version": "1.0.30000367",
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000367.tgz"
"version": "1.0.30000372",
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000372.tgz"
},
"cardinal": {
"version": "0.5.0",
@ -336,6 +336,10 @@
}
}
},
"charenc": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.1.tgz"
},
"clean-css": {
"version": "3.4.8",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.8.tgz",
@ -443,8 +447,8 @@
"resolved": "https://registry.npmjs.org/connect/-/connect-3.4.0.tgz"
},
"connect-livereload": {
"version": "0.5.3",
"resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.3.tgz"
"version": "0.5.4",
"resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.4.tgz"
},
"convert-source-map": {
"version": "1.1.2",
@ -471,15 +475,23 @@
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.9.tgz"
},
"cross-spawn-async": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.0.0.tgz",
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.0.1.tgz",
"dependencies": {
"lru-cache": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz"
},
"which": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz"
}
}
},
"crypt": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.1.tgz"
},
"cryptiles": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
@ -597,8 +609,8 @@
"resolved": "https://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz"
},
"doctrine": {
"version": "0.7.1",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.1.tgz",
"version": "0.7.2",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz",
"dependencies": {
"esutils": {
"version": "1.1.6",
@ -705,8 +717,8 @@
"resolved": "https://registry.npmjs.org/escope/-/escope-3.3.0.tgz"
},
"eslint": {
"version": "1.10.1",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-1.10.1.tgz",
"version": "1.10.2",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-1.10.2.tgz",
"dependencies": {
"argparse": {
"version": "1.0.3",
@ -1309,18 +1321,8 @@
}
},
"har-validator": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz",
"dependencies": {
"pinkie": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz"
},
"pinkie-promise": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz"
}
}
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz"
},
"has-ansi": {
"version": "2.0.0",
@ -1402,6 +1404,10 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"
},
"inherit": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/inherit/-/inherit-2.2.2.tgz"
},
"inherits": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
@ -1537,8 +1543,8 @@
"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
},
"js-yaml": {
"version": "3.4.5",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.4.5.tgz"
"version": "3.4.6",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.4.6.tgz"
},
"minimatch": {
"version": "3.0.0",
@ -1833,8 +1839,8 @@
"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz"
},
"lru-cache": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
"version": "2.7.3",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
},
"map-obj": {
"version": "1.0.1",
@ -1868,6 +1874,16 @@
}
}
},
"md5": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/md5/-/md5-2.0.0.tgz",
"dependencies": {
"is-buffer": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.0.2.tgz"
}
}
},
"mdurl": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"
@ -1975,8 +1991,8 @@
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"
},
"node-gyp": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.1.0.tgz",
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.0.tgz",
"dependencies": {
"glob": {
"version": "4.5.3",
@ -2027,8 +2043,8 @@
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
},
"cross-spawn": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.0.0.tgz"
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.0.1.tgz"
},
"cryptiles": {
"version": "2.0.5",
@ -2133,8 +2149,8 @@
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"
},
"npm": {
"version": "2.14.12",
"resolved": "https://registry.npmjs.org/npm/-/npm-2.14.12.tgz",
"version": "2.14.13",
"resolved": "https://registry.npmjs.org/npm/-/npm-2.14.13.tgz",
"dependencies": {
"abbrev": {
"version": "1.0.7",
@ -2345,8 +2361,8 @@
}
},
"node-gyp": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz",
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.2.0.tgz",
"dependencies": {
"glob": {
"version": "4.5.3",
@ -2491,10 +2507,6 @@
}
}
}
},
"tar": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz"
}
}
},
@ -3130,10 +3142,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz"
},
"spdx": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz"
},
"spdx-license-ids": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"
@ -3163,16 +3171,16 @@
"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
"dependencies": {
"spdx-correct": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz"
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"
},
"spdx-expression-parse": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz",
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz",
"dependencies": {
"spdx-exceptions": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.2.tgz"
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
}
}
}
@ -3355,8 +3363,8 @@
"resolved": "https://registry.npmjs.org/pathval/-/pathval-0.1.1.tgz"
},
"phantomjs": {
"version": "1.9.18",
"resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.18.tgz"
"version": "1.9.19",
"resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.19.tgz"
},
"pify": {
"version": "2.3.0",
@ -3432,6 +3440,10 @@
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
},
"pseudomap": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.1.tgz"
},
"q": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
@ -3825,8 +3837,8 @@
}
},
"spawn-sync": {
"version": "1.0.14",
"resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.14.tgz"
"version": "1.0.13",
"resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.13.tgz"
},
"spdx-correct": {
"version": "1.0.2",
@ -3837,8 +3849,8 @@
"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"
},
"spdx-expression-parse": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.1.tgz"
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz"
},
"spdx-license-ids": {
"version": "1.1.0",

View File

@ -138,7 +138,7 @@
background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center;
background-image: none \9;
background-size: 8px 10px;
border: 1px solid $input-border;
border: $input-border-width solid $input-border-color;
// Use vendor prefixes as `appearance` isn't part of the CSS spec.
-moz-appearance: none;
-webkit-appearance: none;

View File

@ -51,7 +51,7 @@
list-style: none;
background-color: $dropdown-bg;
background-clip: padding-box;
border: 1px solid $dropdown-border;
border: $dropdown-border-width solid $dropdown-border-color;
@include border-radius($border-radius);
@include box-shadow(0 6px 12px rgba(0,0,0,.175));
}

View File

@ -14,7 +14,7 @@
background-color: $input-bg;
// Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214.
background-image: none;
border: $border-width solid $input-border;
border: $input-border-width solid $input-border-color;
// Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.
@include border-radius($input-border-radius);
@include box-shadow($input-box-shadow);

View File

@ -19,7 +19,7 @@
padding: $thumbnail-padding;
line-height: $line-height;
background-color: $thumbnail-bg;
border: 1px solid $thumbnail-border;
border: $thumbnail-border-width solid $thumbnail-border-color;
border-radius: $thumbnail-border-radius;
transition: all .2s ease-in-out;
@include box-shadow(0 1px 2px rgba(0,0,0,.075));

View File

@ -19,6 +19,10 @@
// proper border colors.
position: relative;
z-index: 2;
// Bring the "active" form control to the front
@include hover-focus-active {
z-index: 3;
}
@if $enable-flex {
flex: 1;
} @else {
@ -160,7 +164,7 @@
}
// Bring the "active" button to the front
@include hover-focus-active {
z-index: 2;
z-index: 3;
}
}
@ -176,6 +180,10 @@
> .btn-group {
z-index: 2;
margin-left: -1px;
// Because specificity
@include hover-focus-active {
z-index: 3;
}
}
}
}

View File

@ -3,18 +3,16 @@
margin-bottom: $jumbotron-padding;
background-color: $jumbotron-bg;
@include border-radius($border-radius-lg);
@include media-breakpoint-up(sm) {
padding: ($jumbotron-padding * 2) $jumbotron-padding;
}
}
.jumbotron-hr {
border-top-color: darken($jumbotron-bg, 10%);
}
@include media-breakpoint-up(sm) {
.jumbotron {
padding: ($jumbotron-padding * 2) $jumbotron-padding;
}
}
.jumbotron-fluid {
padding-right: 0;
padding-left: 0;

View File

@ -18,9 +18,9 @@
display: block;
padding: .75rem 1.25rem;
// Place the border on the list items and negative margin up for better styling
margin-bottom: -$border-width;
margin-bottom: -$list-group-border-width;
background-color: $list-group-bg;
border: $border-width solid $list-group-border;
border: $list-group-border-width solid $list-group-border-color;
// Round the first and last items
&:first-child {
@ -34,7 +34,7 @@
.list-group-flush {
.list-group-item {
border-width: $border-width 0;
border-width: $list-group-border-width 0;
border-radius: 0;
}
}

View File

@ -64,7 +64,7 @@
.nav-link {
display: block;
padding: $nav-link-padding;
border: 1px solid transparent;
border: $nav-tabs-link-border-width solid transparent;
@include border-radius($border-radius $border-radius 0 0);
@include hover-focus {

View File

@ -14,7 +14,7 @@
display: inline-block;
padding: 5px 14px;
background-color: $pager-bg;
border: 1px solid $pager-border;
border: $pager-border-width solid $pager-border-color;
border-radius: $pager-border-radius;
}

View File

@ -18,7 +18,7 @@
color: $pagination-color;
text-decoration: none;
background-color: $pagination-bg;
border: 1px solid $pagination-border;
border: $pagination-border-width solid $pagination-border-color;
}
&:first-child {
> a,

View File

@ -12,7 +12,7 @@
font-size: $font-size-sm;
background-color: $popover-bg;
background-clip: padding-box;
border: 1px solid $popover-border-color;
border: $popover-border-width solid $popover-border-color;
@include border-radius($border-radius-lg);
@include box-shadow(0 5px 10px rgba(0,0,0,.2));
@ -107,7 +107,7 @@
margin: 0; // reset heading margin
font-size: $font-size-base;
background-color: $popover-title-bg;
border-bottom: 1px solid darken($popover-title-bg, 5%);
border-bottom: $popover-border-width solid darken($popover-title-bg, 5%);
@include border-radius(($border-radius-lg - 1) ($border-radius-lg - 1) 0 0);
}

View File

@ -12,16 +12,16 @@
padding: $table-cell-padding;
line-height: $line-height;
vertical-align: top;
border-top: 1px solid $table-border-color;
border-top: $table-border-width solid $table-border-color;
}
thead th {
vertical-align: bottom;
border-bottom: 2px solid $table-border-color;
border-bottom: (2 * $table-border-width) solid $table-border-color;
}
tbody + tbody {
border-top: 2px solid $table-border-color;
border-top: (2 * $table-border-width) solid $table-border-color;
}
.table {
@ -47,17 +47,17 @@
// Add borders all around the table and between all the columns.
.table-bordered {
border: 1px solid $table-border-color;
border: $table-border-width solid $table-border-color;
th,
td {
border: 1px solid $table-border-color;
border: $table-border-width solid $table-border-color;
}
thead {
th,
td {
border-bottom-width: 2px;
border-bottom-width: (2 * $table-border-width);
}
}
}
@ -114,7 +114,7 @@
// TODO: find out if we need this still.
//
// border: 1px solid $table-border-color;
// border: $table-border-width solid $table-border-color;
// -ms-overflow-style: -ms-autohiding-scrollbar; // See https://github.com/twbs/bootstrap/pull/10057
}
@ -160,11 +160,11 @@
th,
td {
border-top: 1px solid $table-border-color;
border-left: 1px solid $table-border-color;
border-top: $table-border-width solid $table-border-color;
border-left: $table-border-width solid $table-border-color;
&:last-child {
border-right: 1px solid $table-border-color;
border-right: $table-border-width solid $table-border-color;
}
}
@ -175,7 +175,7 @@
tr:last-child {
th,
td {
border-bottom: 1px solid $table-border-color;
border-bottom: $table-border-width solid $table-border-color;
}
}
}
@ -187,7 +187,7 @@
th,
td {
display: block !important;
border: 1px solid $table-border-color;
border: $table-border-width solid $table-border-color;
}
}
}

View File

@ -46,9 +46,6 @@
// Alignment
.text-left { text-align: left !important; }
.text-right { text-align: right !important; }
.text-center { text-align: center !important; }
.text-justify { text-align: justify !important; }
.text-nowrap { white-space: nowrap !important; }
.text-truncate { @include text-truncate; }

View File

@ -207,6 +207,7 @@ $table-bg-accent: #f9f9f9 !default;
$table-bg-hover: #f5f5f5 !default;
$table-bg-active: $table-bg-hover !default;
$table-border-width: $border-width !default;
$table-border-color: $gray-lighter !default;
@ -265,7 +266,8 @@ $input-bg: #fff !default;
$input-bg-disabled: $gray-lighter !default;
$input-color: $gray !default;
$input-border: #ccc !default;
$input-border-color: #ccc !default;
$input-border-width: $border-width !default;
$input-box-shadow: inset 0 1px 1px rgba(0,0,0,.075) !default;
$input-border-radius: $border-radius !default;
@ -290,7 +292,7 @@ $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-pa
$form-group-margin-bottom: $spacer-y !default;
$input-group-addon-bg: $gray-lighter !default;
$input-group-addon-border-color: $input-border !default;
$input-group-addon-border-color: $input-border-color !default;
$cursor-disabled: not-allowed !default;
@ -305,7 +307,8 @@ $form-icon-danger: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My
// Dropdown menu container and contents.
$dropdown-bg: #fff !default;
$dropdown-border: rgba(0,0,0,.15) !default;
$dropdown-border-color: rgba(0,0,0,.15) !default;
$dropdown-border-width: $border-width !default;
$dropdown-divider-bg: #e5e5e5 !default;
$dropdown-link-color: $gray-dark !default;
@ -364,6 +367,7 @@ $nav-disabled-link-hover-color: $gray-light !default;
$nav-tabs-border-color: #ddd !default;
$nav-tabs-link-border-width: $border-width !default;
$nav-tabs-link-hover-border-color: $gray-lighter !default;
$nav-tabs-active-link-hover-bg: $body-bg !default;
@ -390,7 +394,8 @@ $pagination-padding-y-lg: .75rem !default;
$pagination-color: $link-color !default;
$pagination-bg: #fff !default;
$pagination-border: #ddd !default;
$pagination-border-width: $border-width !default;
$pagination-border-color: #ddd !default;
$pagination-hover-color: $link-hover-color !default;
$pagination-hover-bg: $gray-lighter !default;
@ -408,7 +413,8 @@ $pagination-disabled-border: #ddd !default;
// Pager
$pager-bg: $pagination-bg !default;
$pager-border: $pagination-border !default;
$pager-border-width: $border-width !default;
$pager-border-color: $pagination-border-color !default;
$pager-border-radius: 15px !default;
$pager-hover-bg: $pagination-hover-bg !default;
@ -474,6 +480,7 @@ $tooltip-arrow-color: $tooltip-bg !default;
$popover-bg: #fff !default;
$popover-max-width: 276px !default;
$popover-border-width: $border-width !default;
$popover-border-color: rgba(0,0,0,.2) !default;
$popover-title-bg: darken($popover-bg, 3%) !default;
@ -561,7 +568,8 @@ $progress-bar-info-bg: $brand-info !default;
// List group
$list-group-bg: #fff !default;
$list-group-border: #ddd !default;
$list-group-border-color: #ddd !default;
$list-group-border-width: $border-width !default;
$list-group-border-radius: $border-radius !default;
$list-group-hover-bg: #f5f5f5 !default;
@ -583,7 +591,8 @@ $list-group-link-heading-color: #333 !default;
$thumbnail-padding: .25rem !default;
$thumbnail-bg: $body-bg !default;
$thumbnail-border: #ddd !default;
$thumbnail-border-width: $border-width !default;
$thumbnail-border-color: #ddd !default;
$thumbnail-border-radius: $border-radius !default;