mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00
Code Activity

Merge branch 'derp' into derp_navs

Browse Source 
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
parent 0e47ce959c 87c9ce5333
commit 41f3af407b
65 changed files with 906 additions and 1164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/dist/css/bootstrap.css
Vendored
+166 -89
View File
@@ -1665,7 +1665,6 @@ legend {
}
label {
display: inline-block;
max-width: 100%;
margin-bottom: 5px;
font-weight: bold;
}
@@ -2548,7 +2547,6 @@ tbody.collapse.in {
background-color: #fff;
-webkit-background-clip: padding-box;
background-clip: padding-box;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, .15);
border-radius: .2rem;
-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"] {
position: absolute;
z-index: -1;
filter: alpha(opacity=0);
opacity: 0;
}
.input-group {
@@ -2991,7 +2988,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav > li > a {
position: relative;
display: block;
padding: 10px 15px;
padding: .5em 1em;
line-height: 1.5;
}
.nav > li > a:hover,
.nav > li > a:focus {
@@ -3020,9 +3018,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
overflow: hidden;
background-color: #e5e5e5;
}
.nav > li > a > img {
max-width: none;
}
.nav-tabs {
border-bottom: 1px solid #ddd;
}
@@ -3185,7 +3180,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
.nav-tab-link {
display: block;
padding: 10px 15px;
padding: .5em 1em;
margin-right: .2rem;
line-height: 1.5;
border: 1px solid transparent;
@@ -3233,7 +3228,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-pill-link {
position: relative;
display: block;
padding: 10px 15px;
padding: .5em 1em;
border-radius: .2rem;
}
.nav-pill-link:hover,
@@ -3471,8 +3466,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
margin-left: -.75rem;
border-top: 1px solid transparent;
border-bottom: 1px solid transparent;
-webkit-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);
-webkit-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);
}
@media (min-width: 48em) {
.navbar-form .form-group {
@@ -3998,29 +3993,34 @@ a.label:focus {
background-color: #c9302c;
}
.badge {
position: relative;
top: -.1em;
display: inline-block;
min-width: 10px;
padding: 3px 7px;
font-size: .85rem;
padding-right: .6em;
padding-left: .6em;
font-size: .75em;
font-weight: bold;
line-height: 1;
color: #fff;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
background-color: #818a91;
border-radius: 10px;
border-radius: 2em;
/* .btn & {
position: relative;
top: -1px;
}
*/
}
.badge:empty {
display: none;
}
.btn .badge {
position: relative;
top: -1px;
.badge.pull-left,
.badge.pull-right {
top: .2em;
}
.btn-xs .badge {
top: 0;
padding: 1px 5px;
/*top: 0;*/
/*padding: 1px 5px;*/
}
a.badge:hover,
a.badge:focus {
@@ -4151,7 +4151,7 @@ a.list-group-item.active > .badge,
}
@-webkit-keyframes progress-bar-stripes {
from {
background-position: 40px 0;
background-position: 24px 0;
}
to {
background-position: 0 0;
@@ -4159,7 +4159,7 @@ a.list-group-item.active > .badge,
}
@-o-keyframes progress-bar-stripes {
from {
background-position: 40px 0;
background-position: 24px 0;
}
to {
background-position: 0 0;
@@ -4167,89 +4167,175 @@ a.list-group-item.active > .badge,
}
@keyframes progress-bar-stripes {
from {
background-position: 40px 0;
background-position: 24px 0;
}
to {
background-position: 0 0;
}
}
.progress {
display: block;
width: 100%;
height: 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;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
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 .1rem .1rem rgba(0, 0, 0, .1);
}
.progress-bar {
float: left;
width: 0;
height: 100%;
font-size: .85rem;
line-height: 24px;
color: #fff;
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[value]::-webkit-progress-value::before {
content: attr(value);
}
.progress-striped .progress-bar,
.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: -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: 40px 40px;
background-size: 40px 40px;
.progress[value]::-webkit-progress-value {
background-color: #0074d9;
border-top-left-radius: .2rem;
border-bottom-left-radius: .2rem;
}
.progress.active .progress-bar,
.progress-bar.active {
-webkit-animation: progress-bar-stripes 2s linear infinite;
-o-animation: progress-bar-stripes 2s linear infinite;
animation: progress-bar-stripes 2s linear infinite;
}
.progress-bar[aria-valuenow="0"] {
min-width: 30px;
.progress[value="0"]::-webkit-progress-value {
min-width: 2rem;
color: #818a91;
background-color: transparent;
background-image: none;
-webkit-box-shadow: none;
box-shadow: none;
}
.progress-bar-success {
.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 {
display: inline-block;
height: 24px;
text-indent: -999rem;
background-color: #0074d9;
border-top-left-radius: .2rem;
border-bottom-left-radius: .2rem;
}
.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 {
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-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;
-o-animation: progress-bar-stripes 2s linear infinite;
animation: progress-bar-stripes 2s linear infinite;
}
}
.progress-success[value]::-webkit-progress-value {
background-color: #5cb85c;
}
.progress-striped .progress-bar-success {
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);
.progress-success[value]::-moz-progress-bar {
background-color: #5cb85c;
}
.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;
}
.progress-striped .progress-bar-info {
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);
.progress-info[value]::-moz-progress-bar {
background-color: #5bc0de;
}
.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;
}
.progress-striped .progress-bar-warning {
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);
.progress-warning[value]::-moz-progress-bar {
background-color: #f0ad4e;
}
.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-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);
.progress-danger[value]::-moz-progress-bar {
background-color: #d9534f;
}
@media screen and (min-width:0\0) {
.progress-danger .progress-bar {
background-color: #d9534f;
}
}
.media,
.media-body {
@@ -4544,7 +4630,6 @@ button.close {
background-color: #fff;
-webkit-background-clip: padding-box;
background-clip: padding-box;
border: 1px solid #999;
border: 1px solid rgba(0, 0, 0, .2);
border-radius: .3rem;
outline: 0;
@@ -4731,7 +4816,6 @@ button.close {
background-color: #fff;
-webkit-background-clip: padding-box;
background-clip: padding-box;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, .2);
border-radius: .3rem;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
@@ -4782,7 +4866,6 @@ button.close {
bottom: -11px;
left: 50%;
margin-left: -11px;
border-top-color: #999;
border-top-color: rgba(0, 0, 0, .25);
border-bottom-width: 0;
}
@@ -4797,7 +4880,6 @@ button.close {
top: 50%;
left: -11px;
margin-top: -11px;
border-right-color: #999;
border-right-color: rgba(0, 0, 0, .25);
border-left-width: 0;
}
@@ -4813,7 +4895,6 @@ button.close {
left: 50%;
margin-left: -11px;
border-top-width: 0;
border-bottom-color: #999;
border-bottom-color: rgba(0, 0, 0, .25);
}
.popover.bottom > .arrow:after {
@@ -4828,7 +4909,6 @@ button.close {
right: -11px;
margin-top: -11px;
border-right-width: 0;
border-left-color: #999;
border-left-color: rgba(0, 0, 0, .25);
}
.popover.left > .arrow:after {
@@ -4897,7 +4977,6 @@ button.close {
color: #fff;
text-align: center;
text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
filter: alpha(opacity=50);
opacity: .5;
}
.carousel-control.left {
@@ -4922,7 +5001,6 @@ button.close {
.carousel-control:focus {
color: #fff;
text-decoration: none;
filter: alpha(opacity=90);
outline: 0;
opacity: .9;
}
@@ -4969,7 +5047,6 @@ button.close {
margin: 1px;
text-indent: -999px;
cursor: pointer;
background-color: #000 \9;
background-color: rgba(0, 0, 0, 0);
border: 1px solid #fff;
border-radius: 10px;