Merge branch 'derp' into derp_navs

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2014-07-09 10:48:58 -07:00
commit 41f3af407b
65 changed files with 906 additions and 1164 deletions

View File

@ -170,6 +170,14 @@ module.exports = function (grunt) {
files: { files: {
'dist/css/<%= pkg.name %>-theme.css': 'less/theme.less' 'dist/css/<%= pkg.name %>-theme.css': 'less/theme.less'
} }
},
compileDocs: {
options: {
strictMath: true
},
files: {
'docs/assets/css/docs.min.css': 'docs/assets/less/docs.less'
}
} }
}, },
@ -199,7 +207,7 @@ module.exports = function (grunt) {
src: 'dist/css/<%= pkg.name %>-theme.css' src: 'dist/css/<%= pkg.name %>-theme.css'
}, },
docs: { docs: {
src: 'docs/assets/css/src/docs.css' src: 'docs/assets/css/docs.min.css'
}, },
examples: { examples: {
expand: true, expand: true,
@ -225,7 +233,7 @@ module.exports = function (grunt) {
ids: false, ids: false,
'overqualified-elements': false 'overqualified-elements': false
}, },
src: 'docs/assets/css/src/docs.css' src: 'docs/assets/css/docs.css'
} }
}, },
@ -242,10 +250,7 @@ module.exports = function (grunt) {
} }
}, },
docs: { docs: {
src: [ src: 'docs/assets/css/docs.min.css',
'docs/assets/css/src/docs.css',
'docs/assets/css/src/pygments-manni.css'
],
dest: 'docs/assets/css/docs.min.css' dest: 'docs/assets/css/docs.min.css'
} }
}, },
@ -355,6 +360,10 @@ module.exports = function (grunt) {
less: { less: {
files: 'less/*.less', files: 'less/*.less',
tasks: 'less' tasks: 'less'
},
docs: {
files: 'docs/assets/less/*.less',
tasks: 'less'
} }
}, },

View File

@ -182,7 +182,6 @@
background-color: #c12e2a; background-color: #c12e2a;
background-image: none; background-image: none;
} }
.thumbnail,
.img-thumbnail { .img-thumbnail {
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075); -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
box-shadow: 0 1px 2px rgba(0, 0, 0, .075); box-shadow: 0 1px 2px rgba(0, 0, 0, .075);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

239
dist/css/bootstrap.css vendored
View File

@ -1665,7 +1665,6 @@ legend {
} }
label { label {
display: inline-block; display: inline-block;
max-width: 100%;
margin-bottom: 5px; margin-bottom: 5px;
font-weight: bold; font-weight: bold;
} }
@ -2548,7 +2547,6 @@ tbody.collapse.in {
background-color: #fff; background-color: #fff;
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, .15); border: 1px solid rgba(0, 0, 0, .15);
border-radius: .2rem; border-radius: .2rem;
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175); -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
@ -2822,7 +2820,6 @@ tbody.collapse.in {
[data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] { [data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] {
position: absolute; position: absolute;
z-index: -1; z-index: -1;
filter: alpha(opacity=0);
opacity: 0; opacity: 0;
} }
.input-group { .input-group {
@ -2991,7 +2988,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav > li > a { .nav > li > a {
position: relative; position: relative;
display: block; display: block;
padding: 10px 15px; padding: .5em 1em;
line-height: 1.5;
} }
.nav > li > a:hover, .nav > li > a:hover,
.nav > li > a:focus { .nav > li > a:focus {
@ -3020,9 +3018,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
overflow: hidden; overflow: hidden;
background-color: #e5e5e5; background-color: #e5e5e5;
} }
.nav > li > a > img {
max-width: none;
}
.nav-tabs { .nav-tabs {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
@ -3185,7 +3180,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
} }
.nav-tab-link { .nav-tab-link {
display: block; display: block;
padding: 10px 15px; padding: .5em 1em;
margin-right: .2rem; margin-right: .2rem;
line-height: 1.5; line-height: 1.5;
border: 1px solid transparent; border: 1px solid transparent;
@ -3233,7 +3228,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-pill-link { .nav-pill-link {
position: relative; position: relative;
display: block; display: block;
padding: 10px 15px; padding: .5em 1em;
border-radius: .2rem; border-radius: .2rem;
} }
.nav-pill-link:hover, .nav-pill-link:hover,
@ -3998,29 +3993,34 @@ a.label:focus {
background-color: #c9302c; background-color: #c9302c;
} }
.badge { .badge {
position: relative;
top: -.1em;
display: inline-block; display: inline-block;
min-width: 10px; padding-right: .6em;
padding: 3px 7px; padding-left: .6em;
font-size: .85rem; font-size: .75em;
font-weight: bold; font-weight: bold;
line-height: 1;
color: #fff; color: #fff;
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
vertical-align: baseline;
background-color: #818a91; background-color: #818a91;
border-radius: 10px; border-radius: 2em;
/* .btn & {
position: relative;
top: -1px;
}
*/
} }
.badge:empty { .badge:empty {
display: none; display: none;
} }
.btn .badge { .badge.pull-left,
position: relative; .badge.pull-right {
top: -1px; top: .2em;
} }
.btn-xs .badge { .btn-xs .badge {
top: 0; /*top: 0;*/
padding: 1px 5px; /*padding: 1px 5px;*/
} }
a.badge:hover, a.badge:hover,
a.badge:focus { a.badge:focus {
@ -4151,7 +4151,7 @@ a.list-group-item.active > .badge,
} }
@-webkit-keyframes progress-bar-stripes { @-webkit-keyframes progress-bar-stripes {
from { from {
background-position: 40px 0; background-position: 24px 0;
} }
to { to {
background-position: 0 0; background-position: 0 0;
@ -4159,7 +4159,7 @@ a.list-group-item.active > .badge,
} }
@-o-keyframes progress-bar-stripes { @-o-keyframes progress-bar-stripes {
from { from {
background-position: 40px 0; background-position: 24px 0;
} }
to { to {
background-position: 0 0; background-position: 0 0;
@ -4167,89 +4167,175 @@ a.list-group-item.active > .badge,
} }
@keyframes progress-bar-stripes { @keyframes progress-bar-stripes {
from { from {
background-position: 40px 0; background-position: 24px 0;
} }
to { to {
background-position: 0 0; background-position: 0 0;
} }
} }
.progress { .progress {
display: block;
width: 100%;
height: 24px; height: 24px;
margin-bottom: 24px; margin-bottom: 24px;
overflow: hidden; }
background-color: #f5f5f5; .progress[value] {
color: #0074d9;
border: 0;
appearance: none;
}
.progress[value]::-webkit-progress-bar {
background-color: #eee;
border-radius: .2rem; border-radius: .2rem;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); -webkit-box-shadow: inset 0 .1rem .1rem rgba(0, 0, 0, .1);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); box-shadow: inset 0 .1rem .1rem rgba(0, 0, 0, .1);
}
.progress[value]::-webkit-progress-value::before {
content: attr(value);
}
.progress[value]::-webkit-progress-value {
background-color: #0074d9;
border-top-left-radius: .2rem;
border-bottom-left-radius: .2rem;
}
.progress[value="0"]::-webkit-progress-value {
min-width: 2rem;
color: #818a91;
background-color: transparent;
background-image: none;
}
.progress[value="100"]::-webkit-progress-value {
border-top-right-radius: .2rem;
border-bottom-right-radius: .2rem;
}
@-moz-document url-prefix() {
.progress[value] {
background-color: #eee;
border-radius: .2rem;
box-shadow: inset 0 .1rem .1rem rgba(0, 0, 0, .1);
}
.progress[value]::-moz-progress-bar {
background-color: #0074d9;
border-top-left-radius: .2rem;
border-bottom-left-radius: .2rem;
}
.progress[value="0"]::-moz-progress-bar {
min-width: 2rem;
color: #818a91;
background-color: transparent;
background-image: none;
}
.progress[value="100"]::-moz-progress-bar {
border-top-right-radius: .2rem;
border-bottom-right-radius: .2rem;
}
}
@media screen and (min-width:0\0) {
.progress {
background-color: #eee;
border-radius: .2rem;
-webkit-box-shadow: inset 0 .1rem .1rem rgba(0, 0, 0, .1);
box-shadow: inset 0 .1rem .1rem rgba(0, 0, 0, .1);
} }
.progress-bar { .progress-bar {
float: left; display: inline-block;
width: 0; height: 24px;
height: 100%; text-indent: -999rem;
font-size: .85rem; background-color: #0074d9;
line-height: 24px; border-top-left-radius: .2rem;
color: #fff; border-bottom-left-radius: .2rem;
text-align: center;
background-color: #027de7;
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
-webkit-transition: width .6s ease;
-o-transition: width .6s ease;
transition: width .6s ease;
} }
.progress-striped .progress-bar, .progress[width^="0"] {
min-width: 2rem;
color: #818a91;
background-color: transparent;
background-image: none;
}
.progress[width="100%"] {
border-top-right-radius: .2rem;
border-bottom-right-radius: .2rem;
}
}
.progress-striped[value]::-webkit-progress-value {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-webkit-background-size: 24px 24px;
background-size: 24px 24px;
}
.progress-striped[value]::-moz-progress-bar {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-size: 24px 24px;
}
@media screen and (min-width:0\0) {
.progress-bar-striped { .progress-bar-striped {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-webkit-background-size: 40px 40px; -webkit-background-size: 24px 24px;
background-size: 40px 40px; background-size: 24px 24px;
} }
.progress.active .progress-bar, }
.progress-bar.active { .progress-animated[value]::-webkit-progress-value {
-webkit-animation: progress-bar-stripes 2s linear infinite;
animation: progress-bar-stripes 2s linear infinite;
}
.progress-animated[value]::-moz-progress-bar {
animation: progress-bar-stripes 2s linear infinite;
}
@media screen and (min-width:0\0) {
.progress-animated .progress-bar-striped {
-webkit-animation: progress-bar-stripes 2s linear infinite; -webkit-animation: progress-bar-stripes 2s linear infinite;
-o-animation: progress-bar-stripes 2s linear infinite; -o-animation: progress-bar-stripes 2s linear infinite;
animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite;
} }
.progress-bar[aria-valuenow="0"] {
min-width: 30px;
color: #818a91;
background-color: transparent;
background-image: none;
-webkit-box-shadow: none;
box-shadow: none;
} }
.progress-bar-success { .progress-success[value]::-webkit-progress-value {
background-color: #5cb85c; background-color: #5cb85c;
} }
.progress-striped .progress-bar-success { .progress-success[value]::-moz-progress-bar {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-color: #5cb85c;
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
} }
.progress-bar-info { @media screen and (min-width:0\0) {
.progress-success .progress-bar {
background-color: #5cb85c;
}
}
.progress-info[value]::-webkit-progress-value {
background-color: #5bc0de; background-color: #5bc0de;
} }
.progress-striped .progress-bar-info { .progress-info[value]::-moz-progress-bar {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-color: #5bc0de;
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
} }
.progress-bar-warning { @media screen and (min-width:0\0) {
.progress-info .progress-bar {
background-color: #5bc0de;
}
}
.progress-warning[value]::-webkit-progress-value {
background-color: #f0ad4e; background-color: #f0ad4e;
} }
.progress-striped .progress-bar-warning { .progress-warning[value]::-moz-progress-bar {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-color: #f0ad4e;
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
} }
.progress-bar-danger { @media screen and (min-width:0\0) {
.progress-warning .progress-bar {
background-color: #f0ad4e;
}
}
.progress-danger[value]::-webkit-progress-value {
background-color: #d9534f;
}
.progress-danger[value]::-moz-progress-bar {
background-color: #d9534f;
}
@media screen and (min-width:0\0) {
.progress-danger .progress-bar {
background-color: #d9534f; background-color: #d9534f;
} }
.progress-striped .progress-bar-danger {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
} }
.media, .media,
.media-body { .media-body {
@ -4544,7 +4630,6 @@ button.close {
background-color: #fff; background-color: #fff;
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid #999;
border: 1px solid rgba(0, 0, 0, .2); border: 1px solid rgba(0, 0, 0, .2);
border-radius: .3rem; border-radius: .3rem;
outline: 0; outline: 0;
@ -4731,7 +4816,6 @@ button.close {
background-color: #fff; background-color: #fff;
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, .2); border: 1px solid rgba(0, 0, 0, .2);
border-radius: .3rem; border-radius: .3rem;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2); -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
@ -4782,7 +4866,6 @@ button.close {
bottom: -11px; bottom: -11px;
left: 50%; left: 50%;
margin-left: -11px; margin-left: -11px;
border-top-color: #999;
border-top-color: rgba(0, 0, 0, .25); border-top-color: rgba(0, 0, 0, .25);
border-bottom-width: 0; border-bottom-width: 0;
} }
@ -4797,7 +4880,6 @@ button.close {
top: 50%; top: 50%;
left: -11px; left: -11px;
margin-top: -11px; margin-top: -11px;
border-right-color: #999;
border-right-color: rgba(0, 0, 0, .25); border-right-color: rgba(0, 0, 0, .25);
border-left-width: 0; border-left-width: 0;
} }
@ -4813,7 +4895,6 @@ button.close {
left: 50%; left: 50%;
margin-left: -11px; margin-left: -11px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #999;
border-bottom-color: rgba(0, 0, 0, .25); border-bottom-color: rgba(0, 0, 0, .25);
} }
.popover.bottom > .arrow:after { .popover.bottom > .arrow:after {
@ -4828,7 +4909,6 @@ button.close {
right: -11px; right: -11px;
margin-top: -11px; margin-top: -11px;
border-right-width: 0; border-right-width: 0;
border-left-color: #999;
border-left-color: rgba(0, 0, 0, .25); border-left-color: rgba(0, 0, 0, .25);
} }
.popover.left > .arrow:after { .popover.left > .arrow:after {
@ -4897,7 +4977,6 @@ button.close {
color: #fff; color: #fff;
text-align: center; text-align: center;
text-shadow: 0 1px 2px rgba(0, 0, 0, .6); text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
filter: alpha(opacity=50);
opacity: .5; opacity: .5;
} }
.carousel-control.left { .carousel-control.left {
@ -4922,7 +5001,6 @@ button.close {
.carousel-control:focus { .carousel-control:focus {
color: #fff; color: #fff;
text-decoration: none; text-decoration: none;
filter: alpha(opacity=90);
outline: 0; outline: 0;
opacity: .9; opacity: .9;
} }
@ -4969,7 +5047,6 @@ button.close {
margin: 1px; margin: 1px;
text-indent: -999px; text-indent: -999px;
cursor: pointer; cursor: pointer;
background-color: #000 \9;
background-color: rgba(0, 0, 0, 0); background-color: rgba(0, 0, 0, 0);
border: 1px solid #fff; border: 1px solid #fff;
border-radius: 10px; border-radius: 10px;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -43,9 +43,20 @@
</li> </li>
</ul> </ul>
<br> <br>
<button class="btn btn-primary" type="button"> <p>
Messages <span class="badge">4</span> <button class="btn btn-primary btn-lg" type="button">
Large button <span class="badge">4</span>
</button> </button>
<button class="btn btn-primary" type="button">
Button <span class="badge">4</span>
</button>
<button class="btn btn-primary btn-sm" type="button">
Small button <span class="badge">4</span>
</button>
<button class="btn btn-primary btn-xs" type="button">
Extra small <span class="badge">4</span>
</button>
</p>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="nav nav-pills nav-stacked" role="tablist"> <ul class="nav nav-pills nav-stacked" role="tablist">

View File

@ -1,182 +1,79 @@
<div class="bs-docs-section"> <div class="bs-docs-section">
<h1 id="progress" class="page-header">Progress bars</h1> <h1 id="progress" class="page-header">Progress bars</h1>
<p class="lead">Provide up-to-date feedback on the progress of a workflow or action with simple yet flexible progress bars.</p> <p class="lead">Stylize the HTML5 <code>&lt;progress&gt;</code> element with a few extra classes and some crafty browser-specific CSS. Be sure to read up on the browser support.</p>
<div class="bs-callout bs-callout-danger">
<h4>Cross-browser compatibility</h4>
<p>Progress bars use CSS3 transitions and animations to achieve some of their effects. These features are not supported in Internet Explorer 9 and below or older versions of Firefox. Opera 12 does not support animations.</p>
</div>
<h3 id="progress-basic">Basic example</h3> <h3 id="progress-basic">Basic example</h3>
<p>Default progress bar.</p> <p>Default progress bar.</p>
<div class="bs-example"> <div class="bs-example">
<div class="progress"> <progress class="progress" value="0" max="100">0%</progress>
<div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;"> <progress class="progress" value="25" max="100">25%</progress>
<span class="sr-only">60% Complete</span> <progress class="progress" value="50" max="100">50%</progress>
</div> <progress class="progress" value="75" max="100">75%</progress>
</div> <progress class="progress" value="100" max="100">100%</progress>
</div> </div>
{% highlight html %} {% highlight html %}
<div class="progress"> <progress class="progress" value="0" max="100">0%</progress>
<div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;"> <progress class="progress" value="25" max="100">25%</progress>
<span class="sr-only">60% Complete</span> <progress class="progress" value="50" max="100">50%</progress>
</div> <progress class="progress" value="75" max="100">75%</progress>
</div> <progress class="progress" value="100" max="100">100%</progress>
{% endhighlight %} {% endhighlight %}
<h3 id="progress-label">With label</h3> <h3 id="progress-ie9">Internet Explorer 9 support</h3>
<p>Remove the <code>.sr-only</code> class from within the progress bar to show a visible percentage. For low percentages, consider adding a <code>min-width</code> to ensure the label's text is fully visible.</p> <p>IE9 doesn't support the HTML5 <code>&lt;progress&gt;</code> element, but we can work around that.</p>
<div class="bs-example"> <div class="bs-example">
<progress class="progress" value="25" max="100">
<div class="progress"> <div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;"> <span class="progress-bar" style="width: 25%;">25%</span>
60%
</div>
</div> </div>
</progress>
</div> </div>
{% highlight html %} {% highlight html %}
<progress class="progress" value="25" max="100">
<div class="progress"> <div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;"> <span class="progress-bar" style="width: 25%;">25%</span>
60%
</div>
</div> </div>
</progress>
{% endhighlight %} {% endhighlight %}
<h3 id="progress-alternatives">Contextual alternatives</h3> <h3 id="progress-alternatives">Contextual alternatives</h3>
<p>Progress bars use some of the same button and alert classes for consistent styles.</p> <p>Progress bars use some of the same button and alert classes for consistent styles.</p>
<div class="bs-example"> <div class="bs-example">
<div class="progress"> <progress class="progress progress-success" value="25" max="100">25%</progress>
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%"> <progress class="progress progress-info" value="50" max="100">50%</progress>
<span class="sr-only">40% Complete (success)</span> <progress class="progress progress-warning" value="75" max="100">75%</progress>
</div> <progress class="progress progress-danger" value="100" max="100">100%</progress>
</div>
<div class="progress">
<div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%">
<span class="sr-only">20% Complete</span>
</div>
</div>
<div class="progress">
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%">
<span class="sr-only">60% Complete (warning)</span>
</div>
</div>
<div class="progress">
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%">
<span class="sr-only">80% Complete (danger)</span>
</div>
</div>
</div> </div>
{% highlight html %} {% highlight html %}
<div class="progress"> <progress class="progress progress-success" value="25" max="100">25%</progress>
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%"> <progress class="progress progress-info" value="50" max="100">50%</progress>
<span class="sr-only">40% Complete (success)</span> <progress class="progress progress-warning" value="75" max="100">75%</progress>
</div> <progress class="progress progress-danger" value="100" max="100">100%</progress>
</div>
<div class="progress">
<div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%">
<span class="sr-only">20% Complete</span>
</div>
</div>
<div class="progress">
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%">
<span class="sr-only">60% Complete (warning)</span>
</div>
</div>
<div class="progress">
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%">
<span class="sr-only">80% Complete</span>
</div>
</div>
{% endhighlight %} {% endhighlight %}
<h3 id="progress-striped">Striped</h3> <h3 id="progress-striped">Striped</h3>
<p>Uses a gradient to create a striped effect. Not available in IE8.</p> <p>Uses a gradient to create a striped effect.</p>
<div class="bs-example"> <div class="bs-example">
<div class="progress"> <progress class="progress progress-striped" value="10" max="100">10%</progress>
<div class="progress-bar progress-bar-success progress-bar-striped" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%"> <progress class="progress progress-striped progress-success" value="25" max="100">25%</progress>
<span class="sr-only">40% Complete (success)</span> <progress class="progress progress-striped progress-info" value="50" max="100">50%</progress>
</div> <progress class="progress progress-striped progress-warning" value="75" max="100">75%</progress>
</div> <progress class="progress progress-striped progress-danger" value="100" max="100">100%</progress>
<div class="progress">
<div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%">
<span class="sr-only">20% Complete</span>
</div>
</div>
<div class="progress">
<div class="progress-bar progress-bar-warning progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%">
<span class="sr-only">60% Complete (warning)</span>
</div>
</div>
<div class="progress">
<div class="progress-bar progress-bar-danger progress-bar-striped" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%">
<span class="sr-only">80% Complete (danger)</span>
</div>
</div>
</div> </div>
{% highlight html %} {% highlight html %}
<div class="progress"> <progress class="progress progress-striped" value="10" max="100">10%</progress>
<div class="progress-bar progress-bar-success progress-bar-striped" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%"> <progress class="progress progress-striped progress-success" value="25" max="100">25%</progress>
<span class="sr-only">40% Complete (success)</span> <progress class="progress progress-striped progress-info" value="50" max="100">50%</progress>
</div> <progress class="progress progress-striped progress-warning" value="75" max="100">75%</progress>
</div> <progress class="progress progress-striped progress-danger" value="100" max="100">100%</progress>
<div class="progress">
<div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%">
<span class="sr-only">20% Complete</span>
</div>
</div>
<div class="progress">
<div class="progress-bar progress-bar-warning progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%">
<span class="sr-only">60% Complete (warning)</span>
</div>
</div>
<div class="progress">
<div class="progress-bar progress-bar-danger progress-bar-striped" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%">
<span class="sr-only">80% Complete (danger)</span>
</div>
</div>
{% endhighlight %} {% endhighlight %}
<h3 id="progress-animated">Animated</h3> <h3 id="progress-animated">Animated</h3>
<p>Add <code>.active</code> to <code>.progress-bar-striped</code> to animate the stripes right to left. Not available in IE9 and below.</p> <p>Add <code>.progress-animated</code> to <code>.progress</code> to animate the stripes right to left via CSS3 animations. Animated progress bars do not work in IE9, older versions of Firefox, and Opera 12 as they don't support CSS3 animations.</p>
<div class="bs-example"> <div class="bs-example">
<div class="progress"> <progress class="progress progress-striped progress-animated" value="25" max="100">25%</progress>
<div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 45%"><span class="sr-only">45% Complete</span></div>
</div>
</div> </div>
{% highlight html %} {% highlight html %}
<div class="progress"> <progress class="progress progress-striped progress-animated" value="25" max="100">25%</progress>
<div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 45%">
<span class="sr-only">45% Complete</span>
</div>
</div>
{% endhighlight %} {% endhighlight %}
<h3 id="progress-stacked">Stacked</h3>
<p>Place multiple bars into the same <code>.progress</code> to stack them.</p>
<div class="bs-example">
<div class="progress">
<div class="progress-bar progress-bar-success" style="width: 35%">
<span class="sr-only">35% Complete (success)</span>
</div>
<div class="progress-bar progress-bar-warning progress-bar-striped" style="width: 20%">
<span class="sr-only">20% Complete (warning)</span>
</div>
<div class="progress-bar progress-bar-danger" style="width: 10%">
<span class="sr-only">10% Complete (danger)</span>
</div>
</div>
</div>
{% highlight html %}
<div class="progress">
<div class="progress-bar progress-bar-success" style="width: 35%">
<span class="sr-only">35% Complete (success)</span>
</div>
<div class="progress-bar progress-bar-warning progress-bar-striped" style="width: 20%">
<span class="sr-only">20% Complete (warning)</span>
</div>
<div class="progress-bar progress-bar-danger" style="width: 10%">
<span class="sr-only">10% Complete (danger)</span>
</div>
</div>
{% endhighlight %}
</div>

View File

@ -29,23 +29,12 @@
{% endif %} {% endif %}
<!-- Documentation extras --> <!-- Documentation extras -->
{% if site.github %}
<link href="../assets/css/docs.min.css" rel="stylesheet"> <link href="../assets/css/docs.min.css" rel="stylesheet">
{% else %}
<link href="../assets/css/src/docs.css" rel="stylesheet">
<link href="../assets/css/src/pygments-manni.css" rel="stylesheet">
{% endif %}
<!--[if lt IE 9]><script src="../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../assets/js/ie10-viewport-bug-workaround.js"></script>
<script src="../assets/js/ie-emulation-modes-warning.js"></script> <script src="../assets/js/ie-emulation-modes-warning.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<!-- Favicons --> <!-- Favicons -->
<link rel="apple-touch-icon-precomposed" href="/apple-touch-icon-precomposed.png"> <link rel="apple-touch-icon-precomposed" href="/apple-touch-icon-precomposed.png">
<link rel="icon" href="/favicon.ico"> <link rel="icon" href="/favicon.ico">

View File

@ -8,8 +8,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a href="../" class="navbar-brand"> <a href="../" class="navbar-brand">
<span class="visible-xs">Bootstrap</span> Bootstrap
<span class="bs-docs-booticon bs-docs-booticon-md hidden-xs">B</span>
</a> </a>
</div> </div>
<nav class="collapse navbar-collapse bs-sidenav-collapse" role="navigation"> <nav class="collapse navbar-collapse bs-sidenav-collapse" role="navigation">

File diff suppressed because one or more lines are too long

View File

@ -1,66 +0,0 @@
.hll { background-color: #ffffcc }
/*{ background: #f0f3f3; }*/
.c { color: #999; } /* Comment */
.err { color: #AA0000; background-color: #FFAAAA } /* Error */
.k { color: #006699; } /* Keyword */
.o { color: #555555 } /* Operator */
.cm { color: #999; } /* Comment.Multiline */ /* Edited to remove italics and make into comment */
.cp { color: #009999 } /* Comment.Preproc */
.c1 { color: #999; } /* Comment.Single */
.cs { color: #999; } /* Comment.Special */
.gd { background-color: #FFCCCC; border: 1px solid #CC0000 } /* Generic.Deleted */
.ge { font-style: italic } /* Generic.Emph */
.gr { color: #FF0000 } /* Generic.Error */
.gh { color: #003300; } /* Generic.Heading */
.gi { background-color: #CCFFCC; border: 1px solid #00CC00 } /* Generic.Inserted */
.go { color: #AAAAAA } /* Generic.Output */
.gp { color: #000099; } /* Generic.Prompt */
.gs { } /* Generic.Strong */
.gu { color: #003300; } /* Generic.Subheading */
.gt { color: #99CC66 } /* Generic.Traceback */
.kc { color: #006699; } /* Keyword.Constant */
.kd { color: #006699; } /* Keyword.Declaration */
.kn { color: #006699; } /* Keyword.Namespace */
.kp { color: #006699 } /* Keyword.Pseudo */
.kr { color: #006699; } /* Keyword.Reserved */
.kt { color: #007788; } /* Keyword.Type */
.m { color: #FF6600 } /* Literal.Number */
.s { color: #d44950 } /* Literal.String */
.na { color: #4f9fcf } /* Name.Attribute */
.nb { color: #336666 } /* Name.Builtin */
.nc { color: #00AA88; } /* Name.Class */
.no { color: #336600 } /* Name.Constant */
.nd { color: #9999FF } /* Name.Decorator */
.ni { color: #999999; } /* Name.Entity */
.ne { color: #CC0000; } /* Name.Exception */
.nf { color: #CC00FF } /* Name.Function */
.nl { color: #9999FF } /* Name.Label */
.nn { color: #00CCFF; } /* Name.Namespace */
.nt { color: #2f6f9f; } /* Name.Tag */
.nv { color: #003333 } /* Name.Variable */
.ow { color: #000000; } /* Operator.Word */
.w { color: #bbbbbb } /* Text.Whitespace */
.mf { color: #FF6600 } /* Literal.Number.Float */
.mh { color: #FF6600 } /* Literal.Number.Hex */
.mi { color: #FF6600 } /* Literal.Number.Integer */
.mo { color: #FF6600 } /* Literal.Number.Oct */
.sb { color: #CC3300 } /* Literal.String.Backtick */
.sc { color: #CC3300 } /* Literal.String.Char */
.sd { color: #CC3300; font-style: italic } /* Literal.String.Doc */
.s2 { color: #CC3300 } /* Literal.String.Double */
.se { color: #CC3300; } /* Literal.String.Escape */
.sh { color: #CC3300 } /* Literal.String.Heredoc */
.si { color: #AA0000 } /* Literal.String.Interpol */
.sx { color: #CC3300 } /* Literal.String.Other */
.sr { color: #33AAAA } /* Literal.String.Regex */
.s1 { color: #CC3300 } /* Literal.String.Single */
.ss { color: #FFCC33 } /* Literal.String.Symbol */
.bp { color: #336666 } /* Name.Builtin.Pseudo */
.vc { color: #003333 } /* Name.Variable.Class */
.vg { color: #003333 } /* Name.Variable.Global */
.vi { color: #003333 } /* Name.Variable.Instance */
.il { color: #FF6600 } /* Literal.Number.Integer.Long */
.css .o,
.css .o + .nt,
.css .nt + .nt { color: #999; }

View File

@ -21,4 +21,4 @@ var Holder=Holder||{};!function(a,b){function c(a,b,c){b=parseInt(b,10),a=parseI
* 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/.
*/ */
!function(a){"use strict";a(function(){var b=a(window),c=a(document.body);c.scrollspy({target:".active .bs-docs-sidenav"}),b.on("load",function(){c.scrollspy("refresh")}),a(".bs-docs-container [href=#]").click(function(a){a.preventDefault()}),function(){var b=a("#bs-theme-stylesheet"),c=a(".bs-docs-theme-toggle"),d=function(){b.attr("href",b.attr("data-href")),c.text("Disable theme preview"),localStorage.setItem("previewTheme",!0)};localStorage.getItem("previewTheme")&&d(),c.click(function(){var a=b.attr("href");a&&0!==a.indexOf("data")?(b.attr("href",""),c.text("Preview theme"),localStorage.removeItem("previewTheme")):d()})}(),a(".tooltip-demo").tooltip({selector:'[data-toggle="tooltip"]',container:"body"}),a(".popover-demo").popover({selector:'[data-toggle="popover"]',container:"body"}),a(".tooltip-test").tooltip(),a(".popover-test").popover(),a(".bs-docs-popover").popover(),a(".bs-docs-popover-dismiss").popover({trigger:"focus"}),a("#loading-example-btn").click(function(){var b=a(this);b.button("loading"),setTimeout(function(){b.button("reset")},3e3)}),ZeroClipboard.config({moviePath:"/assets/flash/ZeroClipboard.swf",hoverClass:"btn-clipboard-hover"}),a(".highlight").each(function(){var b=a(this),c=b.prev(),d='<div class="zero-clipboard"><span class="btn-clipboard">Copy</span></div>';c.hasClass("bs-example")?c.before(d.replace(/btn-clipboard/,"btn-clipboard with-example")):b.before(d)});var d=new ZeroClipboard(a(".btn-clipboard")),e=a("#global-zeroclipboard-html-bridge");d.on("load",function(){e.data("placement","top").attr("title","Copy to clipboard").tooltip()}),d.on("dataRequested",function(b){var c=a(this).parent().nextAll(".highlight").first();b.setText(c.text())}),d.on("complete",function(){e.attr("title","Copied!").tooltip("fixTitle").tooltip("show").attr("title","Copy to clipboard").tooltip("fixTitle")}),d.on("noflash wrongflash",function(){e.attr("title","Flash required").tooltip("fixTitle").tooltip("show")})})}(jQuery); !function(a){"use strict";a(function(){var b=a(window),c=a(document.body);c.scrollspy({target:".active .bs-docs-sidenav"}),b.on("load",function(){c.scrollspy("refresh")}),a(".bs-docs-container [href=#]").click(function(a){a.preventDefault()})(function(){var b=a("#bs-theme-stylesheet"),c=a(".bs-docs-theme-toggle"),d=function(){b.attr("href",b.attr("data-href")),c.text("Disable theme preview"),localStorage.setItem("previewTheme",!0)};localStorage.getItem("previewTheme")&&d(),c.click(function(){var a=b.attr("href");a&&0!==a.indexOf("data")?(b.attr("href",""),c.text("Preview theme"),localStorage.removeItem("previewTheme")):d()})}),a(".tooltip-demo").tooltip({selector:'[data-toggle="tooltip"]',container:"body"}),a(".popover-demo").popover({selector:'[data-toggle="popover"]',container:"body"}),a(".tooltip-test").tooltip(),a(".popover-test").popover(),a(".bs-docs-popover").popover(),a(".bs-docs-popover-dismiss").popover({trigger:"focus"}),a("#loading-example-btn").click(function(){var b=a(this);b.button("loading"),setTimeout(function(){b.button("reset")},3e3)}),ZeroClipboard.config({moviePath:"/assets/flash/ZeroClipboard.swf",hoverClass:"btn-clipboard-hover"}),a(".highlight").each(function(){var b=a(this),c=b.prev(),d='<div class="zero-clipboard"><span class="btn-clipboard">Copy</span></div>';c.hasClass("bs-example")?c.before(d.replace(/btn-clipboard/,"btn-clipboard with-example")):b.before(d)});var d=new ZeroClipboard(a(".btn-clipboard")),e=a("#global-zeroclipboard-html-bridge");d.on("load",function(){e.data("placement","top").attr("title","Copy to clipboard").tooltip()}),d.on("dataRequested",function(b){var c=a(this).parent().nextAll(".highlight").first();b.setText(c.text())}),d.on("complete",function(){e.attr("title","Copied!").tooltip("fixTitle").tooltip("show").attr("title","Copy to clipboard").tooltip("fixTitle")}),d.on("noflash wrongflash",function(){e.attr("title","Flash required").tooltip("fixTitle").tooltip("show")})})}(jQuery);

View File

@ -1,13 +0,0 @@
// NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT
// IT'S JUST JUNK FOR OUR DOCS!
// ++++++++++++++++++++++++++++++++++++++++++
/*!
* Copyright 2011-2014 Twitter, Inc.
*
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see http://creativecommons.org/licenses/by/3.0/.
*/
// Intended to prevent false-positive bug reports about responsive styling supposedly not working in IE8.
if (window.location.protocol == 'file:') {
window.alert('ERROR: Bootstrap\'s responsive CSS is disabled!\nSee getbootstrap.com/getting-started/#respond-file-proto for details.')
}

View File

@ -32,32 +32,8 @@
e.preventDefault() e.preventDefault()
}) })
// Sidenav affixing
// setTimeout(function () {
// var $sideBar = $('.bs-docs-sidebar')
// $sideBar.affix({
// offset: {
// top: function () {
// var offsetTop = $sideBar.offset().top
// var sideBarMargin = parseInt($sideBar.children(0).css('margin-top'), 10)
// var navOuterHeight = $('.bs-docs-nav').height()
// return (this.top = offsetTop - navOuterHeight - sideBarMargin)
// },
// bottom: function () {
// return (this.bottom = $('.bs-docs-footer').outerHeight(true))
// }
// }
// })
// }, 100)
// setTimeout(function () {
// $('.bs-top').affix()
// }, 100)
// theme toggler // theme toggler
;(function () { (function () {
var stylesheetLink = $('#bs-theme-stylesheet') var stylesheetLink = $('#bs-theme-stylesheet')
var themeBtn = $('.bs-docs-theme-toggle') var themeBtn = $('.bs-docs-theme-toggle')
@ -81,7 +57,7 @@
localStorage.removeItem('previewTheme') localStorage.removeItem('previewTheme')
} }
}) })
})(); })
// Tooltip and popover demos // Tooltip and popover demos
$('.tooltip-demo').tooltip({ $('.tooltip-demo').tooltip({

View File

@ -5,30 +5,31 @@
* details, see http://creativecommons.org/licenses/by/3.0/. * details, see http://creativecommons.org/licenses/by/3.0/.
*/ */
// Import Bootstrap variables and mixins
@import "../../../less/variables.less";
@import "../../../less/mixins.less";
/* // Import the syntax highlighting
* Bootstrap Documentation @import "syntax.less";
* Special styles for presenting Bootstrap's documentation and code examples.
*/ // Local docs variables
@bs-purple: #563d7c;
@bs-purple-light: #cdbfe3;
/* // Scaffolding
* Scaffolding //
* // Update the basics of our documents to prep for docs content.
* Update the basics of our documents to prep for docs content.
*/
body { body {
position: relative; /* For scrollspy */ position: relative; // For scrollspy?
} }
/* Keep code small in tables on account of limited space */
.table code {
font-size: 13px;
font-weight: normal;
}
/* Outline button for use within the docs */ //
// Buttons
//
.btn-outline { .btn-outline {
color: #563d7c; color: #563d7c;
background-color: transparent; background-color: transparent;
@ -42,7 +43,6 @@ body {
border-color: #563d7c; border-color: #563d7c;
} }
/* Inverted outline button (white on dark) */
.btn-outline-inverse { .btn-outline-inverse {
color: #fff; color: #fff;
background-color: transparent; background-color: transparent;
@ -57,50 +57,38 @@ body {
border-color: #fff; border-color: #fff;
} }
/* Bootstrap "B" icon */
//
// Bootstrap "B" icon
//
.bs-docs-booticon { .bs-docs-booticon {
display: block; display: block;
width: 144px;
height: 144px;
font-size: 108px;
font-weight: 500; font-weight: 500;
line-height: 140px;
color: #fff; color: #fff;
text-align: center; text-align: center;
cursor: default; cursor: default;
background-color: #563d7c; background-color: #563d7c;
border-radius: 15%; border-radius: 15%;
}
.bs-docs-booticon-sm { &.inverse {
width: 30px;
height: 30px;
font-size: 20px;
line-height: 28px;
}
.bs-docs-booticon-md {
width: 40px;
height: 40px;
font-size: 28px;
line-height: 40px;
}
.bs-docs-booticon-lg {
width: 144px;
height: 144px;
font-size: 108px;
line-height: 140px;
}
.bs-docs-booticon-inverse {
color: #563d7c; color: #563d7c;
background-color: #fff; background-color: #fff;
} }
.bs-docs-booticon-outline { &.outline {
background-color: transparent; background-color: transparent;
border: 1px solid #cdbfe3; border: 1px solid #cdbfe3;
} }
}
/* //
* Main navigation // Main navigation
* //
* Turn the `.navbar` at the top of the docs purple.
*/
.bs-docs-nav { .bs-docs-nav {
margin-bottom: 0; margin-bottom: 0;
@ -137,11 +125,9 @@ body {
} }
/* //
* Footer // Footer
* //
* Separated section of content at the bottom of all pages, save the homepage.
*/
.bs-docs-footer { .bs-docs-footer {
margin-top: 100px; margin-top: 100px;
@ -172,11 +158,9 @@ body {
} }
/* //
* Social buttons // Social buttons
* //
* Twitter and GitHub social action buttons (for homepage and footer).
*/
.bs-docs-social { .bs-docs-social {
margin-bottom: 20px; margin-bottom: 20px;
@ -199,7 +183,8 @@ body {
.bs-docs-social-buttons .twitter-share-button { .bs-docs-social-buttons .twitter-share-button {
width: 98px !important; width: 98px !important;
} }
/* Style the GitHub buttons via CSS instead of inline attributes */
// Style the GitHub buttons via CSS instead of inline attributes
.github-btn { .github-btn {
overflow: hidden; overflow: hidden;
border: 0; border: 0;
@ -213,13 +198,11 @@ body {
} }
/* //
* Homepage // Homepage
* //
* Tweaks to the custom homepage and the masthead (main jumbotron).
*/
/* Masthead (headings and download button) */ // Masthead (headings and download button)
.bs-docs-masthead { .bs-docs-masthead {
position: relative; position: relative;
padding: 30px 15px; padding: 30px 15px;
@ -227,12 +210,7 @@ body {
text-align: center; text-align: center;
text-shadow: 0 1px 0 rgba(0,0,0,.1); text-shadow: 0 1px 0 rgba(0,0,0,.1);
background-color: #6f5499; background-color: #6f5499;
background-image: -webkit-gradient(linear, left top, left bottom, from(#563d7c), to(#6f5499)); #gradient > .vertical(@bs-purple, #6f5499);
background-image: -webkit-linear-gradient(top, #563d7c 0%, #6f5499 100%);
background-image: -o-linear-gradient(top, #563d7c 0%, #6f5499 100%);
background-image: linear-gradient(to bottom, #563d7c 0%, #6f5499 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#563d7c', endColorstr='#6f5499', GradientType=0);
background-repeat: repeat-x;
} }
.bs-docs-masthead .bs-docs-booticon { .bs-docs-masthead .bs-docs-booticon {
@ -285,13 +263,10 @@ body {
} }
/* //
* Page headers // Page headers
* //
* Jumbotron-esque headers at the top of every page that's not the homepage.
*/
/* Page headers */
.bs-docs-header { .bs-docs-header {
padding-top: 2rem; padding-top: 2rem;
padding-bottom: 2rem; padding-bottom: 2rem;
@ -336,12 +311,9 @@ body {
} }
/* //
* Carbon ads // Carbon ads
* //
* Single display ad that shows on all pages (except homepage) in page headers.
* The hella `!important` is required for any pre-set property.
*/
.carbonad { .carbonad {
width: auto !important; width: auto !important;
@ -351,6 +323,7 @@ body {
overflow: hidden; /* clearfix */ overflow: hidden; /* clearfix */
font-size: 13px !important; font-size: 13px !important;
line-height: 16px !important; line-height: 16px !important;
color: @bs-purple-light !important;
text-align: left; text-align: left;
background: transparent !important; background: transparent !important;
border: solid #866ab3 !important; border: solid #866ab3 !important;
@ -380,19 +353,19 @@ body {
color: #fff !important; color: #fff !important;
} }
.carbonad #azcarbon > img { .carbonad #azcarbon > img {
display: none; /* hide what I assume are tracking images */ display: none; // hide what I assume are tracking images
} }
/* In the lighter page headers */ // In the lighter page headers
.bs-docs-header .carbonad { // .bs-docs-header .carbonad {
color: #777; // color: #777;
background-color: #fff !important; // background-color: #fff !important;
border-color: #eee !important; // border-color: #eee !important;
} // }
.bs-docs-header .carbonad-text a, // .bs-docs-header .carbonad-text a,
.bs-docs-header .carbonad-tag a { // .bs-docs-header .carbonad-tag a {
color: #563d7c !important; // color: #563d7c !important;
} // }
@media (min-width: 480px) { @media (min-width: 480px) {
.carbonad { .carbonad {
@ -417,7 +390,7 @@ body {
.carbonad { .carbonad {
position: absolute; position: absolute;
top: 30px; top: 30px;
right: 60px; /* 15px instead of 0 since box-sizing */ right: 60px; // 15px instead of 0 since box-sizing
width: 330px !important; width: 330px !important;
padding: 15px !important; padding: 15px !important;
margin: 0 !important; margin: 0 !important;
@ -428,11 +401,9 @@ body {
} }
/* //
* Homepage featurettes // Homepage featurettes
* //
* Reasons to use Bootstrap, entries from the Expo, and more.
*/
.bs-docs-featurette { .bs-docs-featurette {
padding-top: 40px; padding-top: 40px;
@ -502,11 +473,9 @@ body {
} }
/* //
* Featured sites // Featured Expo sites
* //
* Homepage thumbnails from the Expo.
*/
.bs-docs-featured-sites { .bs-docs-featured-sites {
margin-right: -1px; margin-right: -1px;
@ -531,11 +500,9 @@ body {
} }
/* //
* Examples // Examples
* //
* Linked docs examples.
*/
.bs-examples .thumbnail { .bs-examples .thumbnail {
margin-bottom: 10px; margin-bottom: 10px;
@ -559,12 +526,9 @@ body {
} }
/* //
* Side navigation // Side navigation
* //
* Scrollspy and affixed enhanced navigation to highlight sections and secondary
* sections of docs content.
*/
.bs-docs-container { .bs-docs-container {
position: relative; position: relative;
@ -621,12 +585,7 @@ body {
width: 240px; width: 240px;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
background-image: -webkit-gradient(linear, left top, left bottom, from(#29262f), to(#322f38)); #gradient > .vertical(#29262f, #322f38);
background-image: -webkit-linear-gradient(top, #29262f 0%, #322f38 100%);
background-image: -o-linear-gradient(top, #29262f 0%, #322f38 100%);
background-image: linear-gradient(to bottom, #29262f 0%, #322f38 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#29262f', endColorstr='#322f38', GradientType=0);
background-repeat: repeat-x;
} }
.bs-docs-sidebar .navbar-brand { .bs-docs-sidebar .navbar-brand {
margin-bottom: 15px; margin-bottom: 15px;
@ -643,6 +602,7 @@ body {
font-weight: 500; font-weight: 500;
line-height: 1; line-height: 1;
color: #fff; color: #fff;
border-bottom: 1px solid rgba(255,255,255,.1);
} }
.bs-docs-sidebar-brand:hover, .bs-docs-sidebar-brand:hover,
.bs-docs-sidebar-brand:focus { .bs-docs-sidebar-brand:focus {
@ -688,7 +648,7 @@ body {
margin-bottom: 30px; margin-bottom: 30px;
} }
/* All levels of nav */ // All levels of nav
.bs-docs-sidebar .nav > li > a { .bs-docs-sidebar .nav > li > a {
display: block; display: block;
padding: 4px 20px; padding: 4px 20px;
@ -709,9 +669,9 @@ body {
background-color: transparent; background-color: transparent;
} }
/* Nav: second level (shown on .active) */ // Nav: second level (shown on .active)
.bs-docs-sidebar .nav .nav { .bs-docs-sidebar .nav .nav {
display: none; /* Hide by default, but at >768px, show it */ display: none; // Hide by default, but at >768px, show it
padding-bottom: 10px; padding-bottom: 10px;
} }
.bs-docs-sidebar .nav .nav > li > a { .bs-docs-sidebar .nav .nav > li > a {
@ -727,16 +687,6 @@ body {
font-weight: 500; font-weight: 500;
} }
/* Back to top (hidden on mobile) */
.back-to-top,
.bs-docs-theme-toggle {
display: none;
}
.back-to-top:hover,
.bs-docs-theme-toggle:hover {
color: #563d7c;
text-decoration: none;
}
.bs-docs-sidebar .nav > .active > .nav { .bs-docs-sidebar .nav > .active > .nav {
display: block; display: block;
} }
@ -748,13 +698,11 @@ body {
} }
/* //
* Docs sections // Docs sections
* //
* Content blocks for each component or feature.
*/
/* Space things out */ // Space things out
.bs-docs-section { .bs-docs-section {
margin-bottom: 60px; margin-bottom: 60px;
} }
@ -768,14 +716,10 @@ h1[id] {
} }
/* //
* Callouts // Callouts
* //
* Not quite alerts, but custom and helpful notes for folks reading the docs.
* Requires a base and modifier class.
*/
/* Common styles for all types */
.bs-callout { .bs-callout {
padding: 20px; padding: 20px;
margin: 20px 0; margin: 20px 0;
@ -794,12 +738,11 @@ h1[id] {
border-radius: 3px; border-radius: 3px;
} }
/* Tighten up space between multiple callouts */
.bs-callout + .bs-callout { .bs-callout + .bs-callout {
margin-top: -5px; margin-top: -5px;
} }
/* Variations */ // Variations
.bs-callout-danger { .bs-callout-danger {
border-left-color: #d9534f; border-left-color: #d9534f;
} }
@ -820,15 +763,13 @@ h1[id] {
} }
/* //
* Color swatches // Color swatches
* //
* Color swatches and associated values for our grayscale and brand colors.
*/
.color-swatches { .color-swatches {
margin: 0 -5px; margin: 0 -5px;
overflow: hidden; /* clearfix */ overflow: hidden; // clearfix
} }
.color-swatch { .color-swatch {
float: left; float: left;
@ -845,44 +786,44 @@ h1[id] {
} }
} }
/* Framework colors */ // Framework colors
.color-swatches .gray-darker { .color-swatches .gray-darker {
background-color: #222; background-color: @gray-darker;
} }
.color-swatches .gray-dark { .color-swatches .gray-dark {
background-color: #333; background-color: @gray-dark;
} }
.color-swatches .gray { .color-swatches .gray {
background-color: #555; background-color: @gray;
} }
.color-swatches .gray-light { .color-swatches .gray-light {
background-color: #999; background-color: @gray-light;
} }
.color-swatches .gray-lighter { .color-swatches .gray-lighter {
background-color: #eee; background-color: @gray-lighter;
} }
.color-swatches .brand-primary { .color-swatches .brand-primary {
background-color: #428bca; background-color: @brand-primary;
} }
.color-swatches .brand-success { .color-swatches .brand-success {
background-color: #5cb85c; background-color: @brand-success;
} }
.color-swatches .brand-warning { .color-swatches .brand-warning {
background-color: #f0ad4e; background-color: @brand-warning;
} }
.color-swatches .brand-danger { .color-swatches .brand-danger {
background-color: #d9534f; background-color: @brand-danger;
} }
.color-swatches .brand-info { .color-swatches .brand-info {
background-color: #5bc0de; background-color: @brand-info;
} }
/* Docs colors */ // Docs colors
.color-swatches .bs-purple { .color-swatches .bs-purple {
background-color: #563d7c; background-color: @bs-purple;
} }
.color-swatches .bs-purple-light { .color-swatches .bs-purple-light {
background-color: #c7bfd3; background-color: @bs-purple-light;
} }
.color-swatches .bs-purple-lighter { .color-swatches .bs-purple-lighter {
background-color: #e5e1ea; background-color: #e5e1ea;
@ -892,11 +833,9 @@ h1[id] {
} }
/* //
* Team members // Team members
* //
* Avatars, names, and usernames for core team.
*/
.bs-team .team-member { .bs-team .team-member {
line-height: 32px; line-height: 32px;
@ -920,12 +859,9 @@ h1[id] {
} }
/* //
* Grid examples // Grid examples
* //
* Highlight the grid columns within the docs so folks can see their padding,
* alignment, sizing, etc.
*/
.show-grid { .show-grid {
margin-bottom: 15px; margin-bottom: 15px;
@ -940,49 +876,46 @@ h1[id] {
} }
/* //
* Examples // Docs examples
* //
* Isolated sections of example content for each component or feature. Usually
* followed by a code snippet.
*/
.bs-example { .bs-example {
position: relative; position: relative;
padding-top: 3rem; padding: 1.5rem;
margin-top: 1rem; margin-top: 1rem;
margin-bottom: -1rem;
border: solid #f7f7f9;
border-width: .2rem 0 0;
} }
/* Echo out a label for the example */ // Echo out a label for the example
.bs-example:before { .bs-example:before {
position: absolute; position: absolute;
top: 0; top: 0;
display: inline-block; display: none;
padding: .5rem .75rem; padding: .4rem .75rem;
font-size: .8rem; font-size: .75rem;
font-weight: bold; font-weight: bold;
color: #fff; color: #fff;
text-transform: uppercase; text-transform: uppercase;
letter-spacing: .1rem; letter-spacing: .1rem;
content: "Example"; content: "Example";
background-color: #818a91; background-color: #eb4c82;
border-radius: .2rem; border-radius: .2rem;
} }
/* Tweak display of the code snippets when following an example */ @media (min-width: 480px) {
.bs-example + .highlight:before { .bs-example {
position: absolute; border-width: .2rem;
width: 0; }
height: 0;
border-color: transparent;
border-style: solid;
} }
/* Undo width of container */ // Undo width of container
.bs-example .container { .bs-example .container {
width: auto; width: auto;
} }
/* Tweak content of examples for optimum awesome */ // Tweak content of examples for optimum awesome
.bs-example > p:last-child, .bs-example > p:last-child,
.bs-example > ul:last-child, .bs-example > ul:last-child,
.bs-example > ol:last-child, .bs-example > ol:last-child,
@ -1003,7 +936,7 @@ h1[id] {
float: none; float: none;
} }
/* Typography */ // Typography
.bs-example-type .table .type-info { .bs-example-type .table .type-info {
color: #999; color: #999;
vertical-align: middle; vertical-align: middle;
@ -1024,24 +957,24 @@ h1[id] {
margin: 0; margin: 0;
} }
/* Contextual background colors */ // Contextual background colors
.bs-example-bg-classes p { .bs-example-bg-classes p {
padding: 15px; padding: 15px;
} }
/* Images */ // Images
.bs-example > .img-circle, .bs-example > .img-circle,
.bs-example > .img-rounded, .bs-example > .img-rounded,
.bs-example > .img-thumbnail { .bs-example > .img-thumbnail {
margin: 5px; margin: 5px;
} }
/* Tables */ // Tables
.bs-example > .table-responsive > .table { // .bs-example > .table-responsive > .table {
background-color: #fff; // background-color: #fff;
} // }
/* Buttons */ // Buttons
.bs-example > .btn, .bs-example > .btn,
.bs-example > .btn-group { .bs-example > .btn-group {
margin-top: 5px; margin-top: 5px;
@ -1051,7 +984,7 @@ h1[id] {
margin-top: 10px; margin-top: 10px;
} }
/* Forms */ // Forms
.bs-example-control-sizing select, .bs-example-control-sizing select,
.bs-example-control-sizing input[type="text"] + input[type="text"] { .bs-example-control-sizing input[type="text"] + input[type="text"] {
margin-top: 10px; margin-top: 10px;
@ -1063,12 +996,12 @@ h1[id] {
resize: vertical; resize: vertical;
} }
/* List groups */ // List groups
.bs-example > .list-group { .bs-example > .list-group {
max-width: 400px; max-width: 400px;
} }
/* Navbars */ // Navbars
.bs-example .navbar:last-child { .bs-example .navbar:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
@ -1076,7 +1009,7 @@ h1[id] {
.bs-navbar-bottom-example { .bs-navbar-bottom-example {
z-index: 1; z-index: 1;
padding: 0; padding: 0;
overflow: hidden; /* cut the drop shadows off */ overflow: hidden; // cut the drop shadows off
} }
.bs-navbar-top-example .navbar-header, .bs-navbar-top-example .navbar-header,
.bs-navbar-bottom-example .navbar-header { .bs-navbar-bottom-example .navbar-header {
@ -1114,18 +1047,18 @@ h1[id] {
} }
} }
/* Pagination */ // Pagination
.bs-example .pagination { .bs-example .pagination {
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
} }
/* Pager */ // Pager
.bs-example > .pager { .bs-example > .pager {
margin-top: 0; margin-top: 0;
} }
/* Example modals */ // Example modals
.bs-example-modal { .bs-example-modal {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
@ -1144,7 +1077,7 @@ h1[id] {
margin-left: auto; margin-left: auto;
} }
/* Example dropdowns */ // Example dropdowns
.bs-example > .dropdown > .dropdown-toggle { .bs-example > .dropdown > .dropdown-toggle {
float: left; float: left;
} }
@ -1155,12 +1088,12 @@ h1[id] {
clear: left; clear: left;
} }
/* Example tabbable tabs */ // Example tabbable tabs
.bs-example-tabs .nav-tabs { .bs-example-tabs .nav-tabs {
margin-bottom: 15px; margin-bottom: 15px;
} }
/* Tooltips */ // Tooltips
.bs-example-tooltips { .bs-example-tooltips {
text-align: center; text-align: center;
} }
@ -1169,7 +1102,7 @@ h1[id] {
margin-bottom: 5px; margin-bottom: 5px;
} }
/* Popovers */ // Popovers
.bs-example-popover { .bs-example-popover {
padding-bottom: 24px; padding-bottom: 24px;
background-color: #f9f9f9; background-color: #f9f9f9;
@ -1182,7 +1115,7 @@ h1[id] {
margin: 20px; margin: 20px;
} }
/* Scrollspy demo on fixed height div */ // Scrollspy demo on fixed height div
.scrollspy-example { .scrollspy-example {
position: relative; position: relative;
height: 200px; height: 200px;
@ -1191,11 +1124,9 @@ h1[id] {
} }
/* //
* Code snippets // Code snippets
* //
* Generated via Pygments and Jekyll, these are snippets of HTML, CSS, and JS.
*/
.highlight { .highlight {
padding: 1.5rem; padding: 1.5rem;
@ -1212,22 +1143,20 @@ h1[id] {
} }
.highlight pre code { .highlight pre code {
font-size: inherit; font-size: inherit;
color: #333; /* Effectively the base text color */ color: @gray-dark; // Effectively the base text color
} }
/* //
* Responsive tests // Responsive tests
* //
* Generate a set of tests to show the responsive utilities in action.
*/
/* Responsive (scrollable) doc tables */ // Responsive (scrollable) doc tables
.table-responsive .highlight pre { .table-responsive .highlight pre {
white-space: normal; white-space: normal;
} }
/* Utility classes table */ // Utility classes table
.bs-table th small, .bs-table th small,
.responsive-utilities th small { .responsive-utilities th small {
display: block; display: block;
@ -1249,7 +1178,7 @@ h1[id] {
background-color: #f9f9f9 !important; background-color: #f9f9f9 !important;
} }
/* Responsive tests */ // Responsive tests
.responsive-utilities-test { .responsive-utilities-test {
margin-top: 5px; margin-top: 5px;
} }
@ -1290,72 +1219,16 @@ h1[id] {
} }
/* //
* Glyphicons // Customizer
* //
* Special styles for displaying the icons and their classes in the docs.
*/
.bs-glyphicons {
margin: 0 -10px 20px;
overflow: hidden;
}
.bs-glyphicons-list {
padding-left: 0;
list-style: none;
}
.bs-glyphicons li {
float: left;
width: 25%;
height: 115px;
padding: 10px;
font-size: 10px;
line-height: 1.4;
text-align: center;
background-color: #f9f9f9;
border: 1px solid #fff;
}
.bs-glyphicons .glyphicon {
margin-top: 5px;
margin-bottom: 10px;
font-size: 24px;
}
.bs-glyphicons .glyphicon-class {
display: block;
text-align: center;
word-wrap: break-word; /* Help out IE10+ with class names */
}
.bs-glyphicons li:hover {
color: #fff;
background-color: #563d7c;
}
@media (min-width: 768px) {
.bs-glyphicons {
margin-right: 0;
margin-left: 0;
}
.bs-glyphicons li {
width: 12.5%;
font-size: 12px;
}
}
/*
* Customizer
*
* Since this is so form control heavy, we have quite a few styles to customize
* the display of inputs, headings, and more. Also included are all the download
* buttons and actions.
*/
.bs-customizer .toggle { .bs-customizer .toggle {
float: right; float: right;
margin-top: 25px; margin-top: 25px;
} }
/* Headings and form contrls */ // Headings and form controls
.bs-customizer label { .bs-customizer label {
margin-top: 10px; margin-top: 10px;
font-weight: 500; font-weight: 500;
@ -1374,7 +1247,7 @@ h1[id] {
margin-bottom: 0; margin-bottom: 0;
} }
.bs-customizer .bs-callout h4 { .bs-customizer .bs-callout h4 {
margin-top: 0; /* lame, but due to specificity we have to duplicate */ margin-top: 0; // lame, but due to specificity we have to duplicate
margin-bottom: 5px; margin-bottom: 5px;
} }
.bs-customizer input[type="text"] { .bs-customizer input[type="text"] {
@ -1386,7 +1259,7 @@ h1[id] {
font-size: 12px; font-size: 12px;
} }
/* For the variables, use regular weight */ // For the variables, use regular weight
#less-section label { #less-section label {
font-weight: normal; font-weight: normal;
} }
@ -1398,12 +1271,12 @@ h1[id] {
padding-left: 15px; padding-left: 15px;
} }
/* Downloads */ // Downloads
.bs-customize-download .btn-outline { .bs-customize-download .btn-outline {
padding: 20px; padding: 20px;
} }
/* Error handling */ // Error handling
.bs-customizer-alert { .bs-customizer-alert {
position: fixed; position: fixed;
top: 0; top: 0;
@ -1437,13 +1310,11 @@ h1[id] {
} }
/* //
* Brand guidelines // Brand guidelines
* //
* Extra styles for displaying wordmarks, logos, etc.
*/
/* Logo series wrapper */ // Logo series wrapper
.bs-brand-logos { .bs-brand-logos {
display: table; display: table;
width: 100%; width: 100%;
@ -1454,7 +1325,7 @@ h1[id] {
border-radius: 4px; border-radius: 4px;
} }
/* Individual items */ // Individual items
.bs-brand-item { .bs-brand-item {
padding: 60px 0; padding: 60px 0;
text-align: center; text-align: center;
@ -1471,7 +1342,7 @@ h1[id] {
height: 144px; height: 144px;
} }
/* Heading content within */ // Heading content within
.bs-brand-item h1, .bs-brand-item h1,
.bs-brand-item h3 { .bs-brand-item h3 {
margin-top: 0; margin-top: 0;
@ -1482,21 +1353,21 @@ h1[id] {
margin-left: auto; margin-left: auto;
} }
/* Make the icons stand out on what is/isn't okay */ // Make the icons stand out on what is/isn't okay
.bs-brand-item .glyphicon { // .bs-brand-item .glyphicon {
width: 30px; // width: 30px;
height: 30px; // height: 30px;
margin: 10px auto -10px; // margin: 10px auto -10px;
line-height: 30px; // line-height: 30px;
color: #fff; // color: #fff;
border-radius: 50%; // border-radius: 50%;
} // }
.bs-brand-item .glyphicon-ok { // .bs-brand-item .glyphicon-ok {
background-color: #5cb85c; // background-color: #5cb85c;
} // }
.bs-brand-item .glyphicon-remove { // .bs-brand-item .glyphicon-remove {
background-color: #d9534f; // background-color: #d9534f;
} // }
@media (min-width: 768px) { @media (min-width: 768px) {
.bs-brand-item { .bs-brand-item {
@ -1513,9 +1384,9 @@ h1[id] {
} }
/* //
* ZeroClipboard styles // ZeroClipboard styles
*/ //
.zero-clipboard { .zero-clipboard {
position: relative; position: relative;
@ -1547,18 +1418,14 @@ h1[id] {
} }
/* //
* Miscellaneous // Miscellaneous
* //
* Odds and ends for optimum docs display.
*/
/* Pseudo :focus state for showing how it looks in the docs */ // Pseudo :focus state for showing how it looks in the docs
#focusedInput { #focusedInput {
border-color: rgb(204,204,204); /* Restate unfocused value to make CSSLint happy that there's a pre-CSS3 fallback*/ border-color: @input-border-focus;
border-color: rgba(82,168,236,.8);
outline: 0; outline: 0;
outline: thin dotted \9; /* IE6-9 */ outline: thin dotted \9; // IE9
-webkit-box-shadow: 0 0 8px rgba(82,168,236,.6); box-shadow: 0 0 8px @input-box-shadow-focus;
box-shadow: 0 0 8px rgba(82,168,236,.6);
} }

View File

@ -0,0 +1,64 @@
.hll { background-color: #ffffcc }
.c { color: #999; }
.err { color: #AA0000; background-color: #FFAAAA }
.k { color: #006699; }
.o { color: #555555 }
.cm { color: #999; }
.cp { color: #009999 }
.c1 { color: #999; }
.cs { color: #999; }
.gd { background-color: #FFCCCC; border: 1px solid #CC0000 }
.ge { font-style: italic }
.gr { color: #FF0000 }
.gh { color: #003300; }
.gi { background-color: #CCFFCC; border: 1px solid #00CC00 }
.go { color: #AAAAAA }
.gp { color: #000099; }
.gu { color: #003300; }
.gt { color: #99CC66 }
.kc { color: #006699; }
.kd { color: #006699; }
.kn { color: #006699; }
.kp { color: #006699 }
.kr { color: #006699; }
.kt { color: #007788; }
.m { color: #FF6600 }
.s { color: #d44950 }
.na { color: #4f9fcf }
.nb { color: #336666 }
.nc { color: #00AA88; }
.no { color: #336600 }
.nd { color: #9999FF }
.ni { color: #999999; }
.ne { color: #CC0000; }
.nf { color: #CC00FF }
.nl { color: #9999FF }
.nn { color: #00CCFF; }
.nt { color: #2f6f9f; }
.nv { color: #003333 }
.ow { color: #000000; }
.w { color: #bbbbbb }
.mf { color: #FF6600 }
.mh { color: #FF6600 }
.mi { color: #FF6600 }
.mo { color: #FF6600 }
.sb { color: #CC3300 }
.sc { color: #CC3300 }
.sd { color: #CC3300; font-style: italic }
.s2 { color: #CC3300 }
.se { color: #CC3300; }
.sh { color: #CC3300 }
.si { color: #AA0000 }
.sx { color: #CC3300 }
.sr { color: #33AAAA }
.s1 { color: #CC3300 }
.ss { color: #FFCC33 }
.bp { color: #336666 }
.vc { color: #003333 }
.vg { color: #003333 }
.vi { color: #003333 }
.il { color: #FF6600 }
.css .o,
.css .o + .nt,
.css .nt + .nt { color: #999; }

View File

@ -2,7 +2,7 @@
layout: default layout: default
title: Components title: Components
slug: components slug: components
lead: "Over a dozen reusable components built to provide iconography, dropdowns, input groups, navigation, alerts, and much more." lead: "Over a dozen reusable components built to provide dropdowns, input groups, navigation, alerts, and much more."
--- ---
{% include components/dropdowns.html %} {% include components/dropdowns.html %}

View File

@ -182,7 +182,6 @@
background-color: #c12e2a; background-color: #c12e2a;
background-image: none; background-image: none;
} }
.thumbnail,
.img-thumbnail { .img-thumbnail {
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075); -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
box-shadow: 0 1px 2px rgba(0, 0, 0, .075); box-shadow: 0 1px 2px rgba(0, 0, 0, .075);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1665,7 +1665,6 @@ legend {
} }
label { label {
display: inline-block; display: inline-block;
max-width: 100%;
margin-bottom: 5px; margin-bottom: 5px;
font-weight: bold; font-weight: bold;
} }
@ -2548,7 +2547,6 @@ tbody.collapse.in {
background-color: #fff; background-color: #fff;
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, .15); border: 1px solid rgba(0, 0, 0, .15);
border-radius: .2rem; border-radius: .2rem;
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175); -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
@ -2822,7 +2820,6 @@ tbody.collapse.in {
[data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] { [data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] {
position: absolute; position: absolute;
z-index: -1; z-index: -1;
filter: alpha(opacity=0);
opacity: 0; opacity: 0;
} }
.input-group { .input-group {
@ -2991,7 +2988,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav > li > a { .nav > li > a {
position: relative; position: relative;
display: block; display: block;
padding: 10px 15px; padding: .5em 1em;
line-height: 1.5;
} }
.nav > li > a:hover, .nav > li > a:hover,
.nav > li > a:focus { .nav > li > a:focus {
@ -3020,9 +3018,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
overflow: hidden; overflow: hidden;
background-color: #e5e5e5; background-color: #e5e5e5;
} }
.nav > li > a > img {
max-width: none;
}
.nav-tabs { .nav-tabs {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
@ -3185,7 +3180,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
} }
.nav-tab-link { .nav-tab-link {
display: block; display: block;
padding: 10px 15px; padding: .5em 1em;
margin-right: .2rem; margin-right: .2rem;
line-height: 1.5; line-height: 1.5;
border: 1px solid transparent; border: 1px solid transparent;
@ -3233,7 +3228,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-pill-link { .nav-pill-link {
position: relative; position: relative;
display: block; display: block;
padding: 10px 15px; padding: .5em 1em;
border-radius: .2rem; border-radius: .2rem;
} }
.nav-pill-link:hover, .nav-pill-link:hover,
@ -3998,29 +3993,34 @@ a.label:focus {
background-color: #c9302c; background-color: #c9302c;
} }
.badge { .badge {
position: relative;
top: -.1em;
display: inline-block; display: inline-block;
min-width: 10px; padding-right: .6em;
padding: 3px 7px; padding-left: .6em;
font-size: .85rem; font-size: .75em;
font-weight: bold; font-weight: bold;
line-height: 1;
color: #fff; color: #fff;
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
vertical-align: baseline;
background-color: #818a91; background-color: #818a91;
border-radius: 10px; border-radius: 2em;
/* .btn & {
position: relative;
top: -1px;
}
*/
} }
.badge:empty { .badge:empty {
display: none; display: none;
} }
.btn .badge { .badge.pull-left,
position: relative; .badge.pull-right {
top: -1px; top: .2em;
} }
.btn-xs .badge { .btn-xs .badge {
top: 0; /*top: 0;*/
padding: 1px 5px; /*padding: 1px 5px;*/
} }
a.badge:hover, a.badge:hover,
a.badge:focus { a.badge:focus {
@ -4151,7 +4151,7 @@ a.list-group-item.active > .badge,
} }
@-webkit-keyframes progress-bar-stripes { @-webkit-keyframes progress-bar-stripes {
from { from {
background-position: 40px 0; background-position: 24px 0;
} }
to { to {
background-position: 0 0; background-position: 0 0;
@ -4159,7 +4159,7 @@ a.list-group-item.active > .badge,
} }
@-o-keyframes progress-bar-stripes { @-o-keyframes progress-bar-stripes {
from { from {
background-position: 40px 0; background-position: 24px 0;
} }
to { to {
background-position: 0 0; background-position: 0 0;
@ -4167,89 +4167,175 @@ a.list-group-item.active > .badge,
} }
@keyframes progress-bar-stripes { @keyframes progress-bar-stripes {
from { from {
background-position: 40px 0; background-position: 24px 0;
} }
to { to {
background-position: 0 0; background-position: 0 0;
} }
} }
.progress { .progress {
display: block;
width: 100%;
height: 24px; height: 24px;
margin-bottom: 24px; margin-bottom: 24px;
overflow: hidden; }
background-color: #f5f5f5; .progress[value] {
color: #0074d9;
border: 0;
appearance: none;
}
.progress[value]::-webkit-progress-bar {
background-color: #eee;
border-radius: .2rem; border-radius: .2rem;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); -webkit-box-shadow: inset 0 .1rem .1rem rgba(0, 0, 0, .1);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); box-shadow: inset 0 .1rem .1rem rgba(0, 0, 0, .1);
}
.progress[value]::-webkit-progress-value::before {
content: attr(value);
}
.progress[value]::-webkit-progress-value {
background-color: #0074d9;
border-top-left-radius: .2rem;
border-bottom-left-radius: .2rem;
}
.progress[value="0"]::-webkit-progress-value {
min-width: 2rem;
color: #818a91;
background-color: transparent;
background-image: none;
}
.progress[value="100"]::-webkit-progress-value {
border-top-right-radius: .2rem;
border-bottom-right-radius: .2rem;
}
@-moz-document url-prefix() {
.progress[value] {
background-color: #eee;
border-radius: .2rem;
box-shadow: inset 0 .1rem .1rem rgba(0, 0, 0, .1);
}
.progress[value]::-moz-progress-bar {
background-color: #0074d9;
border-top-left-radius: .2rem;
border-bottom-left-radius: .2rem;
}
.progress[value="0"]::-moz-progress-bar {
min-width: 2rem;
color: #818a91;
background-color: transparent;
background-image: none;
}
.progress[value="100"]::-moz-progress-bar {
border-top-right-radius: .2rem;
border-bottom-right-radius: .2rem;
}
}
@media screen and (min-width:0\0) {
.progress {
background-color: #eee;
border-radius: .2rem;
-webkit-box-shadow: inset 0 .1rem .1rem rgba(0, 0, 0, .1);
box-shadow: inset 0 .1rem .1rem rgba(0, 0, 0, .1);
} }
.progress-bar { .progress-bar {
float: left; display: inline-block;
width: 0; height: 24px;
height: 100%; text-indent: -999rem;
font-size: .85rem; background-color: #0074d9;
line-height: 24px; border-top-left-radius: .2rem;
color: #fff; border-bottom-left-radius: .2rem;
text-align: center;
background-color: #027de7;
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
-webkit-transition: width .6s ease;
-o-transition: width .6s ease;
transition: width .6s ease;
} }
.progress-striped .progress-bar, .progress[width^="0"] {
min-width: 2rem;
color: #818a91;
background-color: transparent;
background-image: none;
}
.progress[width="100%"] {
border-top-right-radius: .2rem;
border-bottom-right-radius: .2rem;
}
}
.progress-striped[value]::-webkit-progress-value {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-webkit-background-size: 24px 24px;
background-size: 24px 24px;
}
.progress-striped[value]::-moz-progress-bar {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-size: 24px 24px;
}
@media screen and (min-width:0\0) {
.progress-bar-striped { .progress-bar-striped {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-webkit-background-size: 40px 40px; -webkit-background-size: 24px 24px;
background-size: 40px 40px; background-size: 24px 24px;
} }
.progress.active .progress-bar, }
.progress-bar.active { .progress-animated[value]::-webkit-progress-value {
-webkit-animation: progress-bar-stripes 2s linear infinite;
animation: progress-bar-stripes 2s linear infinite;
}
.progress-animated[value]::-moz-progress-bar {
animation: progress-bar-stripes 2s linear infinite;
}
@media screen and (min-width:0\0) {
.progress-animated .progress-bar-striped {
-webkit-animation: progress-bar-stripes 2s linear infinite; -webkit-animation: progress-bar-stripes 2s linear infinite;
-o-animation: progress-bar-stripes 2s linear infinite; -o-animation: progress-bar-stripes 2s linear infinite;
animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite;
} }
.progress-bar[aria-valuenow="0"] {
min-width: 30px;
color: #818a91;
background-color: transparent;
background-image: none;
-webkit-box-shadow: none;
box-shadow: none;
} }
.progress-bar-success { .progress-success[value]::-webkit-progress-value {
background-color: #5cb85c; background-color: #5cb85c;
} }
.progress-striped .progress-bar-success { .progress-success[value]::-moz-progress-bar {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-color: #5cb85c;
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
} }
.progress-bar-info { @media screen and (min-width:0\0) {
.progress-success .progress-bar {
background-color: #5cb85c;
}
}
.progress-info[value]::-webkit-progress-value {
background-color: #5bc0de; background-color: #5bc0de;
} }
.progress-striped .progress-bar-info { .progress-info[value]::-moz-progress-bar {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-color: #5bc0de;
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
} }
.progress-bar-warning { @media screen and (min-width:0\0) {
.progress-info .progress-bar {
background-color: #5bc0de;
}
}
.progress-warning[value]::-webkit-progress-value {
background-color: #f0ad4e; background-color: #f0ad4e;
} }
.progress-striped .progress-bar-warning { .progress-warning[value]::-moz-progress-bar {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-color: #f0ad4e;
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
} }
.progress-bar-danger { @media screen and (min-width:0\0) {
.progress-warning .progress-bar {
background-color: #f0ad4e;
}
}
.progress-danger[value]::-webkit-progress-value {
background-color: #d9534f;
}
.progress-danger[value]::-moz-progress-bar {
background-color: #d9534f;
}
@media screen and (min-width:0\0) {
.progress-danger .progress-bar {
background-color: #d9534f; background-color: #d9534f;
} }
.progress-striped .progress-bar-danger {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
} }
.media, .media,
.media-body { .media-body {
@ -4544,7 +4630,6 @@ button.close {
background-color: #fff; background-color: #fff;
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid #999;
border: 1px solid rgba(0, 0, 0, .2); border: 1px solid rgba(0, 0, 0, .2);
border-radius: .3rem; border-radius: .3rem;
outline: 0; outline: 0;
@ -4731,7 +4816,6 @@ button.close {
background-color: #fff; background-color: #fff;
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, .2); border: 1px solid rgba(0, 0, 0, .2);
border-radius: .3rem; border-radius: .3rem;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2); -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
@ -4782,7 +4866,6 @@ button.close {
bottom: -11px; bottom: -11px;
left: 50%; left: 50%;
margin-left: -11px; margin-left: -11px;
border-top-color: #999;
border-top-color: rgba(0, 0, 0, .25); border-top-color: rgba(0, 0, 0, .25);
border-bottom-width: 0; border-bottom-width: 0;
} }
@ -4797,7 +4880,6 @@ button.close {
top: 50%; top: 50%;
left: -11px; left: -11px;
margin-top: -11px; margin-top: -11px;
border-right-color: #999;
border-right-color: rgba(0, 0, 0, .25); border-right-color: rgba(0, 0, 0, .25);
border-left-width: 0; border-left-width: 0;
} }
@ -4813,7 +4895,6 @@ button.close {
left: 50%; left: 50%;
margin-left: -11px; margin-left: -11px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #999;
border-bottom-color: rgba(0, 0, 0, .25); border-bottom-color: rgba(0, 0, 0, .25);
} }
.popover.bottom > .arrow:after { .popover.bottom > .arrow:after {
@ -4828,7 +4909,6 @@ button.close {
right: -11px; right: -11px;
margin-top: -11px; margin-top: -11px;
border-right-width: 0; border-right-width: 0;
border-left-color: #999;
border-left-color: rgba(0, 0, 0, .25); border-left-color: rgba(0, 0, 0, .25);
} }
.popover.left > .arrow:after { .popover.left > .arrow:after {
@ -4897,7 +4977,6 @@ button.close {
color: #fff; color: #fff;
text-align: center; text-align: center;
text-shadow: 0 1px 2px rgba(0, 0, 0, .6); text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
filter: alpha(opacity=50);
opacity: .5; opacity: .5;
} }
.carousel-control.left { .carousel-control.left {
@ -4922,7 +5001,6 @@ button.close {
.carousel-control:focus { .carousel-control:focus {
color: #fff; color: #fff;
text-decoration: none; text-decoration: none;
filter: alpha(opacity=90);
outline: 0; outline: 0;
opacity: .9; opacity: .9;
} }
@ -4969,7 +5047,6 @@ button.close {
margin: 1px; margin: 1px;
text-indent: -999px; text-indent: -999px;
cursor: pointer; cursor: pointer;
background-color: #000 \9;
background-color: rgba(0, 0, 0, 0); background-color: rgba(0, 0, 0, 0);
border: 1px solid #fff; border: 1px solid #fff;
border-radius: 10px; border-radius: 10px;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="blog.css" rel="stylesheet"> <link href="blog.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -13,19 +13,9 @@
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="carousel.css" rel="stylesheet"> <link href="carousel.css" rel="stylesheet">
</head> </head>

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="cover.css" rel="stylesheet"> <link href="cover.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="dashboard.css" rel="stylesheet"> <link href="dashboard.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="grid.css" rel="stylesheet"> <link href="grid.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="jumbotron-narrow.css" rel="stylesheet"> <link href="jumbotron-narrow.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="jumbotron.css" rel="stylesheet"> <link href="jumbotron.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="justified-nav.css" rel="stylesheet"> <link href="justified-nav.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="navbar-fixed-top.css" rel="stylesheet"> <link href="navbar-fixed-top.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="navbar-static-top.css" rel="stylesheet"> <link href="navbar-static-top.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="navbar.css" rel="stylesheet"> <link href="navbar.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -18,18 +18,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="non-responsive.css" rel="stylesheet"> <link href="non-responsive.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="offcanvas.css" rel="stylesheet"> <link href="offcanvas.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="signin.css" rel="stylesheet"> <link href="signin.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="starter-template.css" rel="stylesheet"> <link href="starter-template.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="sticky-footer-navbar.css" rel="stylesheet"> <link href="sticky-footer-navbar.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="sticky-footer.css" rel="stylesheet"> <link href="sticky-footer.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -18,18 +18,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="theme.css" rel="stylesheet"> <link href="theme.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body role="document"> <body role="document">

View File

@ -16,18 +16,8 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="tooltip-viewport.css" rel="stylesheet"> <link href="tooltip-viewport.css" rel="stylesheet">
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
<script src="../../assets/js/ie-emulation-modes-warning.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>

View File

@ -5,7 +5,7 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
<main class="bs-docs-masthead" id="content" role="main"> <main class="bs-docs-masthead" id="content" role="main">
<div class="container"> <div class="container">
<span class="bs-docs-booticon bs-docs-booticon-lg bs-docs-booticon-outline">B</span> <span class="bs-docs-booticon outline">B</span>
<p class="lead">Bootstrap is the most popular HTML, CSS, and JS framework for developing responsive, mobile first projects on the web.</p> <p class="lead">Bootstrap is the most popular HTML, CSS, and JS framework for developing responsive, mobile first projects on the web.</p>
<p class="lead"> <p class="lead">
<a href="getting-started#download" class="btn btn-outline-inverse btn-lg" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download {{ site.current_version }}');">Download Bootstrap</a> <a href="getting-started#download" class="btn btn-outline-inverse btn-lg" onclick="ga('send', 'event', 'Jumbotron actions', 'Download', 'Download {{ site.current_version }}');">Download Bootstrap</a>

View File

@ -5,32 +5,38 @@
// Base class // Base class
.badge { .badge {
position: relative;
top: -.1em;
display: inline-block; display: inline-block;
min-width: 10px; padding-left: .6em;
padding: 3px 7px; padding-right: .6em;
font-size: @font-size-small; font-size: .75em;
font-weight: @badge-font-weight; font-weight: @badge-font-weight;
color: @badge-color; color: @badge-color;
line-height: @badge-line-height;
vertical-align: baseline;
white-space: nowrap;
text-align: center; text-align: center;
white-space: nowrap;
background-color: @badge-bg; background-color: @badge-bg;
.border-radius(@badge-border-radius); .border-radius(@badge-border-radius);
// Empty badges collapse automatically (not available in IE8) // Empty badges collapse automatically
&:empty { &:empty {
display: none; display: none;
} }
&.pull-left,
&.pull-right {
top: .2em;
}
// Quick fix for badges in buttons // Quick fix for badges in buttons
.btn & { /* .btn & {
position: relative; position: relative;
top: -1px; top: -1px;
} }
*/
.btn-xs & { .btn-xs & {
top: 0; /*top: 0;*/
padding: 1px 5px; /*padding: 1px 5px;*/
} }
// Hover state, but only for links // Hover state, but only for links

View File

@ -117,11 +117,11 @@
// The clickable button for toggling the menu // The clickable button for toggling the menu
// Remove the gradient and set the same inset shadow as the :active state // Remove the gradient and set the same inset shadow as the :active state
.btn-group.open .dropdown-toggle { .btn-group.open .dropdown-toggle {
box-shadow: inset 0 3px 5px rgba(0,0,0,.125); .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
// Show no shadow for `.btn-link` since it has no other button styles. // Show no shadow for `.btn-link` since it has no other button styles.
&.btn-link { &.btn-link {
box-shadow: none; .box-shadow(none);
} }
} }
@ -239,7 +239,7 @@
input[type="checkbox"] { input[type="checkbox"] {
position: absolute; position: absolute;
z-index: -1; z-index: -1;
.opacity(0); opacity: 0;
} }
} }
} }

View File

@ -39,7 +39,7 @@
&.active { &.active {
outline: 0; outline: 0;
background-image: none; background-image: none;
box-shadow: inset 0 3px 5px rgba(0,0,0,.125); .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
} }
&.disabled, &.disabled,
@ -48,7 +48,7 @@
cursor: not-allowed; cursor: not-allowed;
pointer-events: none; // Future-proof disabling of clicks pointer-events: none; // Future-proof disabling of clicks
opacity: .65; opacity: .65;
box-shadow: none; .box-shadow(none);
} }
} }
@ -90,7 +90,7 @@
&[disabled], &[disabled],
fieldset[disabled] & { fieldset[disabled] & {
background-color: transparent; background-color: transparent;
box-shadow: none; .box-shadow(none);
} }
&, &,
&:hover, &:hover,

View File

@ -72,7 +72,7 @@
left: 0; left: 0;
bottom: 0; bottom: 0;
width: @carousel-control-width; width: @carousel-control-width;
.opacity(@carousel-control-opacity); opacity: @carousel-control-opacity;
font-size: @carousel-control-font-size; font-size: @carousel-control-font-size;
color: @carousel-control-color; color: @carousel-control-color;
text-align: center; text-align: center;
@ -96,7 +96,7 @@
outline: 0; outline: 0;
color: @carousel-control-color; color: @carousel-control-color;
text-decoration: none; text-decoration: none;
.opacity(.9); opacity: .9;
} }
// Toggles // Toggles
@ -159,15 +159,11 @@
border-radius: 10px; border-radius: 10px;
cursor: pointer; cursor: pointer;
// IE8-9 hack for event handling // IE9 hack for event handling
// //
// Internet Explorer 8-9 does not support clicks on elements without a set // Internet Explorer 9 does not support clicks on elements without a set
// `background-color`. We cannot use `filter` since that's not viewed as a // `background-color`. We cannot use `filter` since that's not viewed as a
// background color by the browser. Thus, a hack is needed. // background color by the browser. Thus, a hack is needed.
//
// For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
// set alpha transparency for the best results possible.
background-color: #000 \9; // IE8
background-color: rgba(0,0,0,0); // IE9 background-color: rgba(0,0,0,0); // IE9
} }
.active { .active {

View File

@ -17,7 +17,7 @@ code {
font-size: 90%; font-size: 90%;
color: @code-color; color: @code-color;
background-color: @code-bg; background-color: @code-bg;
border-radius: @border-radius-base; .border-radius(@border-radius-base);
} }
// User input typically entered via keyboard // User input typically entered via keyboard
@ -26,13 +26,13 @@ kbd {
font-size: 90%; font-size: 90%;
color: @kbd-color; color: @kbd-color;
background-color: @kbd-bg; background-color: @kbd-bg;
border-radius: @border-radius-small; .border-radius(@border-radius-small);
box-shadow: inset 0 -.1rem 0 rgba(0,0,0,.25); .box-shadow(inset 0 -.1rem 0 rgba(0,0,0,.25));
kbd { kbd {
padding: 0; padding: 0;
font-size: 100%; font-size: 100%;
box-shadow: none; .box-shadow(none);
} }
} }

View File

@ -2,11 +2,6 @@
// Component animations // Component animations
// -------------------------------------------------- // --------------------------------------------------
// Heads up!
//
// We don't use the `.opacity()` mixin here since it causes a bug with text
// fields in IE7-8. Source: https://github.com/twbs/bootstrap/pull/3552.
.fade { .fade {
opacity: 0; opacity: 0;
transition: opacity .15s linear; transition: opacity .15s linear;

View File

@ -42,10 +42,9 @@
font-size: @font-size-base; font-size: @font-size-base;
text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer) text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
background-color: @dropdown-bg; background-color: @dropdown-bg;
border: 1px solid @dropdown-fallback-border; // IE8 fallback
border: 1px solid @dropdown-border; border: 1px solid @dropdown-border;
.border-radius(@border-radius-base); .border-radius(@border-radius-base);
box-shadow: 0 6px 12px rgba(0,0,0,.175); .box-shadow(0 6px 12px rgba(0,0,0,.175));
background-clip: padding-box; background-clip: padding-box;
// Dividers (basically an hr) within the dropdown // Dividers (basically an hr) within the dropdown

View File

@ -31,7 +31,6 @@ legend {
label { label {
display: inline-block; display: inline-block;
max-width: 100%; // Force IE8 to wrap long content (see https://github.com/twbs/bootstrap/issues/13141)
margin-bottom: 5px; margin-bottom: 5px;
font-weight: bold; font-weight: bold;
} }
@ -52,7 +51,7 @@ input[type="search"] {
input[type="radio"], input[type="radio"],
input[type="checkbox"] { input[type="checkbox"] {
margin: 4px 0 0; margin: 4px 0 0;
margin-top: 1px \9; // IE8-9 margin-top: 1px \9; // IE9
line-height: normal; line-height: normal;
} }
@ -124,7 +123,7 @@ output {
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: 1px solid @input-border; border: 1px solid @input-border;
.border-radius(@input-border-radius); .border-radius(@input-border-radius);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075); .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
// Customize the `:focus` state to imitate native WebKit styles. // Customize the `:focus` state to imitate native WebKit styles.
@ -182,7 +181,7 @@ input[type="time"],
input[type="datetime-local"], input[type="datetime-local"],
input[type="month"] { input[type="month"] {
line-height: @input-height-base; line-height: @input-height-base;
// IE8+ misaligns the text within date inputs, so we reset // IE9+ misaligns the text within date inputs, so we reset
line-height: @line-height-base ~"\0"; line-height: @line-height-base ~"\0";
&.input-sm { &.input-sm {

View File

@ -24,7 +24,7 @@
} }
} }
// Empty labels collapse automatically (not available in IE8) // Empty labels collapse automatically
&:empty { &:empty {
display: none; display: none;
} }

View File

@ -5,14 +5,13 @@
border-radius: @radius; border-radius: @radius;
} }
.box-shadow(@shadow: 0 .1rem .2rem rgba(0,0,0,.1)) when (@enable-shadows = true) { .box-shadow(@shadow) when (@enable-shadows = true) {
box-shadow: @shadow; box-shadow: @arguments;
} }
// Utilities // Utilities
@import "mixins/hide-text.less"; @import "mixins/hide-text.less";
@import "mixins/opacity.less";
@import "mixins/image.less"; @import "mixins/image.less";
@import "mixins/labels.less"; @import "mixins/labels.less";
@import "mixins/reset-filter.less"; @import "mixins/reset-filter.less";

View File

@ -20,10 +20,11 @@
// Set the border and box shadow on specific inputs to match // Set the border and box shadow on specific inputs to match
.form-control { .form-control {
border-color: @border-color; border-color: @border-color;
box-shadow: inset 0 1px 1px rgba(0,0,0,.075); // Redeclare so transitions work .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
&:focus { &:focus {
border-color: darken(@border-color, 10%); border-color: darken(@border-color, 10%);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%); @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%);
.box-shadow(@shadow);
} }
} }
// Set validation states also for addons // Set validation states also for addons
@ -51,12 +52,12 @@
// //
// Example usage: change the default blue border and shadow to white for better // Example usage: change the default blue border and shadow to white for better
// contrast against a dark gray background. // contrast against a dark gray background.
.form-control-focus(@color: @input-border-focus) { .form-control-focus() {
@color-rgba: rgba(red(@color), green(@color), blue(@color), .6);
&:focus { &:focus {
border-color: @color; border-color: @input-border-focus;
outline: 0; outline: 0;
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @color-rgba; @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @input-box-shadow-focus;
.box-shadow(@shadow);
} }
} }

View File

@ -1,8 +0,0 @@
// Opacity
.opacity(@opacity) {
opacity: @opacity;
// IE8 filter
@opacity-ie: (@opacity * 100);
filter: ~"alpha(opacity=@{opacity-ie})";
}

View File

@ -1,10 +1,15 @@
// Progress bars // Progress bars
.progress-bar-variant(@color) { .progress-variant(@color) {
&[value]::-webkit-progress-value {
background-color: @color;
}
&[value]::-moz-progress-bar {
background-color: @color;
}
@media screen and (~"min-width:0\0") {
.progress-bar {
background-color: @color; background-color: @color;
}
// Deprecated parent class requirement as of v3.2.0
.progress-striped & {
#gradient > .striped();
} }
} }

View File

@ -51,10 +51,9 @@
.modal-content { .modal-content {
position: relative; position: relative;
background-color: @modal-content-bg; background-color: @modal-content-bg;
border: 1px solid @modal-content-fallback-border-color; //old browsers fallback (ie8 etc)
border: 1px solid @modal-content-border-color; border: 1px solid @modal-content-border-color;
.border-radius(@border-radius-large); .border-radius(@border-radius-large);
box-shadow: 0 3px 9px rgba(0,0,0,.5); .box-shadow(0 3px 9px rgba(0,0,0,.5));
background-clip: padding-box; background-clip: padding-box;
// Remove focus outline from opened modal // Remove focus outline from opened modal
outline: 0; outline: 0;
@ -138,7 +137,7 @@
margin: 30px auto; margin: 30px auto;
} }
.modal-content { .modal-content {
box-shadow: 0 5px 15px rgba(0,0,0,.5); .box-shadow(0 5px 15px rgba(0,0,0,.5));
} }
// Modal sizes // Modal sizes

View File

@ -52,7 +52,7 @@
padding-right: @navbar-padding-horizontal; padding-right: @navbar-padding-horizontal;
padding-left: @navbar-padding-horizontal; padding-left: @navbar-padding-horizontal;
border-top: 1px solid transparent; border-top: 1px solid transparent;
box-shadow: inset 0 1px 0 rgba(255,255,255,.1); .box-shadow(inset 0 1px 0 rgba(255,255,255,.1));
&:extend(.clearfix all); &:extend(.clearfix all);
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
@ -63,7 +63,7 @@
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
width: auto; width: auto;
border-top: 0; border-top: 0;
box-shadow: none; .box-shadow(none);
&.collapse { &.collapse {
display: block !important; display: block !important;
@ -248,7 +248,7 @@
margin-top: 0; margin-top: 0;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
box-shadow: none; .box-shadow(none);
> li > a, > li > a,
.dropdown-header { .dropdown-header {
padding: 5px 15px 5px 25px; padding: 5px 15px 5px 25px;
@ -290,7 +290,7 @@
padding: 10px @navbar-padding-horizontal; padding: 10px @navbar-padding-horizontal;
border-top: 1px solid transparent; border-top: 1px solid transparent;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
// Mixin behavior for optimum display // Mixin behavior for optimum display
.form-inline(); .form-inline();
@ -312,7 +312,7 @@
margin-right: 0; margin-right: 0;
padding-top: 0; padding-top: 0;
padding-bottom: 0; padding-bottom: 0;
box-shadow: none; .box-shadow(none);
} }
} }

View File

@ -20,6 +20,8 @@
position: relative; position: relative;
display: block; display: block;
padding: @nav-link-padding; padding: @nav-link-padding;
line-height: @line-height-base;
&:hover, &:hover,
&:focus { &:focus {
text-decoration: none; text-decoration: none;
@ -59,13 +61,6 @@
.nav-divider { .nav-divider {
.nav-divider(); .nav-divider();
} }
// Prevent IE8 from misplacing imgs
//
// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
> li > a > img {
max-width: none;
}
} }

View File

@ -14,10 +14,9 @@
text-align: left; // Reset given new insertion method text-align: left; // Reset given new insertion method
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-border-color; border: 1px solid @popover-border-color;
border-radius: @border-radius-large; .border-radius(@border-radius-large);
box-shadow: 0 5px 10px rgba(0,0,0,.2); .box-shadow(0 5px 10px rgba(0,0,0,.2));
// Overrides for proper insertion // Overrides for proper insertion
white-space: normal; white-space: normal;
@ -72,7 +71,6 @@
left: 50%; left: 50%;
margin-left: -@popover-arrow-outer-width; margin-left: -@popover-arrow-outer-width;
border-bottom-width: 0; border-bottom-width: 0;
border-top-color: @popover-arrow-outer-fallback-color; // IE8 fallback
border-top-color: @popover-arrow-outer-color; border-top-color: @popover-arrow-outer-color;
bottom: -@popover-arrow-outer-width; bottom: -@popover-arrow-outer-width;
&:after { &:after {
@ -88,7 +86,6 @@
left: -@popover-arrow-outer-width; left: -@popover-arrow-outer-width;
margin-top: -@popover-arrow-outer-width; margin-top: -@popover-arrow-outer-width;
border-left-width: 0; border-left-width: 0;
border-right-color: @popover-arrow-outer-fallback-color; // IE8 fallback
border-right-color: @popover-arrow-outer-color; border-right-color: @popover-arrow-outer-color;
&:after { &:after {
content: " "; content: " ";
@ -102,7 +99,6 @@
left: 50%; left: 50%;
margin-left: -@popover-arrow-outer-width; margin-left: -@popover-arrow-outer-width;
border-top-width: 0; border-top-width: 0;
border-bottom-color: @popover-arrow-outer-fallback-color; // IE8 fallback
border-bottom-color: @popover-arrow-outer-color; border-bottom-color: @popover-arrow-outer-color;
top: -@popover-arrow-outer-width; top: -@popover-arrow-outer-width;
&:after { &:after {
@ -119,7 +115,6 @@
right: -@popover-arrow-outer-width; right: -@popover-arrow-outer-width;
margin-top: -@popover-arrow-outer-width; margin-top: -@popover-arrow-outer-width;
border-right-width: 0; border-right-width: 0;
border-left-color: @popover-arrow-outer-fallback-color; // IE8 fallback
border-left-color: @popover-arrow-outer-color; border-left-color: @popover-arrow-outer-color;
&:after { &:after {
content: " "; content: " ";

View File

@ -3,98 +3,165 @@
// -------------------------------------------------- // --------------------------------------------------
// Bar animations //
// ------------------------- // Progress animations
//
// WebKit
@-webkit-keyframes progress-bar-stripes { @-webkit-keyframes progress-bar-stripes {
from { background-position: 40px 0; } from { background-position: @line-height-computed 0; }
to { background-position: 0 0; } to { background-position: 0 0; }
} }
// Spec and IE10+
@keyframes progress-bar-stripes { @keyframes progress-bar-stripes {
from { background-position: 40px 0; } from { background-position: @line-height-computed 0; }
to { background-position: 0 0; } to { background-position: 0 0; }
} }
//
// Basic progress bar
//
// Bar itself
// -------------------------
// Outer container
.progress { .progress {
overflow: hidden; display: block;
width: 100%;
height: @line-height-computed; height: @line-height-computed;
margin-bottom: @line-height-computed; margin-bottom: @line-height-computed;
background-color: @progress-bg; }
.progress[value] {
// Reset the default appearance
appearance: none;
// Remove Firefox and Opera border
border: 0;
// IE10 uses `color` to set the bar background-color
color: #0074d9;
}
.progress[value]::-webkit-progress-bar {
background-color: #eee;
.border-radius(@border-radius-base); .border-radius(@border-radius-base);
box-shadow: inset 0 1px 2px rgba(0,0,0,.1); .box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1));
} }
.progress[value]::-webkit-progress-value::before {
// Bar of progress content: attr(value);
.progress-bar {
float: left;
width: 0%;
height: 100%;
font-size: @font-size-small;
line-height: @line-height-computed;
color: @progress-bar-color;
text-align: center;
background-color: @progress-bar-bg;
box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
transition: width .6s ease;
} }
.progress[value]::-webkit-progress-value {
// Striped bars background-color: #0074d9;
// border-top-left-radius: @border-radius-base;
// `.progress-striped .progress-bar` is deprecated as of v3.2.0 in favor of the border-bottom-left-radius: @border-radius-base;
// `.progress-bar-striped` class, which you just add to an existing
// `.progress-bar`.
.progress-striped .progress-bar,
.progress-bar-striped {
#gradient > .striped();
background-size: 40px 40px;
} }
.progress[value="0"]::-webkit-progress-value {
// Call animation for the active one
//
// `.progress.active .progress-bar` is deprecated as of v3.2.0 in favor of the
// `.progress-bar.active` approach.
.progress.active .progress-bar,
.progress-bar.active {
animation: progress-bar-stripes 2s linear infinite;
}
// Account for lower percentages
.progress-bar {
&[aria-valuenow="0"] {
color: @gray-light; color: @gray-light;
min-width: 30px; min-width: 2rem;
background-color: transparent; background-color: transparent;
background-image: none; background-image: none;
box-shadow: none; }
.progress[value="100"]::-webkit-progress-value {
border-top-right-radius: @border-radius-base;
border-bottom-right-radius: @border-radius-base;
}
// Firefox styles must be entirely separate or it busts Webkit styles.
@-moz-document url-prefix() {
.progress[value] {
background-color: #eee;
.border-radius(@border-radius-base);
.box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1));
}
.progress[value]::-moz-progress-bar {
background-color: #0074d9;
border-top-left-radius: @border-radius-base;
border-bottom-left-radius: @border-radius-base;
}
.progress[value="0"]::-moz-progress-bar {
color: @gray-light;
min-width: 2rem;
background-color: transparent;
background-image: none;
}
.progress[value="100"]::-moz-progress-bar {
border-top-right-radius: @border-radius-base;
border-bottom-right-radius: @border-radius-base;
}
}
// IE9 hacks to accompany custom markup. We don't need to scope this via media queries, but I feel better doing it anyway.
@media screen and (~"min-width:0\0") {
.progress {
background-color: #eee;
.border-radius(@border-radius-base);
.box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1));
}
.progress-bar {
display: inline-block;
height: @line-height-computed;
text-indent: -999rem; // Simulate hiding of value as in native `<progress>`
background-color: #0074d9;
border-top-left-radius: @border-radius-base;
border-bottom-left-radius: @border-radius-base;
}
.progress[width^="0"] {
color: @gray-light;
min-width: 2rem;
background-color: transparent;
background-image: none;
}
.progress[width="100%"] {
border-top-right-radius: @border-radius-base;
border-bottom-right-radius: @border-radius-base;
} }
} }
//
// Striped
//
.progress-striped[value]::-webkit-progress-value {
#gradient > .striped();
background-size: @line-height-computed @line-height-computed;
}
.progress-striped[value]::-moz-progress-bar {
#gradient > .striped();
background-size: @line-height-computed @line-height-computed;
}
@media screen and (~"min-width:0\0") {
.progress-bar-striped {
#gradient > .striped();
background-size: @line-height-computed @line-height-computed;
}
}
//
// Animated
//
.progress-animated[value]::-webkit-progress-value {
animation: progress-bar-stripes 2s linear infinite;
}
.progress-animated[value]::-moz-progress-bar {
animation: progress-bar-stripes 2s linear infinite;
}
@media screen and (~"min-width:0\0") {
.progress-animated .progress-bar-striped {
animation: progress-bar-stripes 2s linear infinite;
}
}
//
// Variations // Variations
// ------------------------- //
.progress-bar-success { .progress-success {
.progress-bar-variant(@progress-bar-success-bg); .progress-variant(@progress-bar-success-bg);
} }
.progress-info {
.progress-bar-info { .progress-variant(@progress-bar-info-bg);
.progress-bar-variant(@progress-bar-info-bg);
} }
.progress-warning {
.progress-bar-warning { .progress-variant(@progress-bar-warning-bg);
.progress-bar-variant(@progress-bar-warning-bg);
} }
.progress-danger {
.progress-bar-danger { .progress-variant(@progress-bar-danger-bg);
.progress-bar-variant(@progress-bar-danger-bg);
} }

View File

@ -19,12 +19,13 @@
.btn-warning, .btn-warning,
.btn-danger { .btn-danger {
text-shadow: 0 -1px 0 rgba(0,0,0,.2); text-shadow: 0 -1px 0 rgba(0,0,0,.2);
box-shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075); @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);
.box-shadow(@shadow);
// Reset the shadow // Reset the shadow
&:active, &:active,
&.active { &.active {
box-shadow: inset 0 3px 5px rgba(0,0,0,.125); .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
} }
} }
@ -77,9 +78,8 @@
// Images // Images
// -------------------------------------------------- // --------------------------------------------------
.thumbnail,
.img-thumbnail { .img-thumbnail {
box-shadow: 0 1px 2px rgba(0,0,0,.075); .box-shadow(0 1px 2px rgba(0,0,0,.075));
} }
@ -111,11 +111,12 @@
#gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg); #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg);
.reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
.border-radius(@navbar-border-radius); .border-radius(@navbar-border-radius);
box-shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075); @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
.box-shadow(@shadow);
.navbar-nav > .active > a { .navbar-nav > .active > a {
#gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%)); #gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%));
box-shadow: inset 0 3px 9px rgba(0,0,0,.075); .box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
} }
} }
.navbar-brand, .navbar-brand,
@ -130,7 +131,7 @@
.navbar-nav > .active > a { .navbar-nav > .active > a {
#gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%)); #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%));
box-shadow: inset 0 3px 9px rgba(0,0,0,.25); .box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
} }
.navbar-brand, .navbar-brand,
@ -155,7 +156,8 @@
// Common styles // Common styles
.alert { .alert {
text-shadow: 0 1px 0 rgba(255,255,255,.2); text-shadow: 0 1px 0 rgba(255,255,255,.2);
box-shadow: inset 0 1px 0 rgba(255,255,255,.25), 0 1px 2px rgba(0,0,0,.05); @shadow: inset 0 1px 0 rgba(255,255,255,.25), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
} }
// Mixin for generating new styles // Mixin for generating new styles
@ -206,7 +208,7 @@
.list-group { .list-group {
.border-radius(@border-radius-base); .border-radius(@border-radius-base);
box-shadow: 0 1px 2px rgba(0,0,0,.075); .box-shadow(0 1px 2px rgba(0,0,0,.075));
} }
.list-group-item.active, .list-group-item.active,
.list-group-item.active:hover, .list-group-item.active:hover,

View File

@ -187,6 +187,7 @@
@input-border-radius: @border-radius-base; @input-border-radius: @border-radius-base;
//** Border color for inputs on focus //** Border color for inputs on focus
@input-border-focus: #66afe9; @input-border-focus: #66afe9;
@input-box-shadow-focus: rgba(102,175,233,.6);
//** Placeholder text color //** Placeholder text color
@input-color-placeholder: @gray-light; @input-color-placeholder: @gray-light;
@ -215,8 +216,6 @@
@dropdown-bg: #fff; @dropdown-bg: #fff;
//** Dropdown menu `border-color`. //** Dropdown menu `border-color`.
@dropdown-border: rgba(0,0,0,.15); @dropdown-border: rgba(0,0,0,.15);
//** Dropdown menu `border-color` **for IE8**.
@dropdown-fallback-border: #ccc;
//** Divider color for between dropdown items. //** Divider color for between dropdown items.
@dropdown-divider-bg: #e5e5e5; @dropdown-divider-bg: #e5e5e5;
@ -370,7 +369,7 @@
//## //##
//=== Shared nav styles //=== Shared nav styles
@nav-link-padding: 10px 15px; @nav-link-padding: .5em 1em;
@nav-link-hover-bg: @gray-lighter; @nav-link-hover-bg: @gray-lighter;
@nav-disabled-link-color: @gray-light; @nav-disabled-link-color: @gray-light;
@ -551,8 +550,6 @@
@modal-content-bg: #fff; @modal-content-bg: #fff;
//** Modal content border color //** Modal content border color
@modal-content-border-color: rgba(0,0,0,.2); @modal-content-border-color: rgba(0,0,0,.2);
//** Modal content border color **for IE8**
@modal-content-fallback-border-color: #999;
//** Modal backdrop background color //** Modal backdrop background color
@modal-backdrop-bg: #000; @modal-backdrop-bg: #000;
@ -678,7 +675,7 @@
@badge-font-weight: bold; @badge-font-weight: bold;
@badge-line-height: 1; @badge-line-height: 1;
@badge-border-radius: 10px; @badge-border-radius: 2em;
//== Breadcrumbs //== Breadcrumbs