2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

Merge branch 'master' into modular-the-mixins

Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
This commit is contained in:
Mark Otto
2014-03-10 00:08:29 -07:00
14 changed files with 21 additions and 21 deletions
+4 -4
View File
@@ -4046,7 +4046,7 @@ tbody.collapse.in {
.btn-group > .btn:focus,
.btn-group-vertical > .btn:focus {
outline: none;
outline: 0;
}
.btn-group .btn + .btn,
@@ -4801,7 +4801,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
.navbar-toggle:focus {
outline: none;
outline: 0;
}
.navbar-toggle .icon-bar {
@@ -6571,7 +6571,7 @@ button.close {
border: 1px solid #999;
border: 1px solid rgba(0, 0, 0, .2);
border-radius: 6px;
outline: none;
outline: 0;
-webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
}
@@ -7011,7 +7011,7 @@ button.close {
color: #fff;
text-decoration: none;
filter: alpha(opacity=90);
outline: none;
outline: 0;
opacity: .9;
}
+1 -1
View File
File diff suppressed because one or more lines are too long
+4 -4
View File
@@ -3207,7 +3207,7 @@ tbody.collapse.in {
}
.btn-group > .btn:focus,
.btn-group-vertical > .btn:focus {
outline: none;
outline: 0;
}
.btn-group .btn + .btn,
.btn-group .btn + .btn-group,
@@ -3835,7 +3835,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
border-radius: 4px;
}
.navbar-toggle:focus {
outline: none;
outline: 0;
}
.navbar-toggle .icon-bar {
display: block;
@@ -5303,7 +5303,7 @@ button.close {
border: 1px solid #999;
border: 1px solid rgba(0, 0, 0, .2);
border-radius: 6px;
outline: none;
outline: 0;
-webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
}
@@ -5678,7 +5678,7 @@ button.close {
color: #fff;
text-decoration: none;
filter: alpha(opacity=90);
outline: none;
outline: 0;
opacity: .9;
}
.carousel-control .icon-prev,
+1 -1
View File
File diff suppressed because one or more lines are too long