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
+1 -1
View File
@@ -20,7 +20,7 @@
}
&:focus {
// Remove focus outline when dropdown JS adds it after closing the menu
outline: none;
outline: 0;
}
}
}
+1 -1
View File
@@ -91,7 +91,7 @@
// Hover/focus state
&:hover,
&:focus {
outline: none;
outline: 0;
color: @carousel-control-color;
text-decoration: none;
.opacity(.9);
+1 -1
View File
@@ -54,7 +54,7 @@
.box-shadow(0 3px 9px rgba(0,0,0,.5));
background-clip: padding-box;
// Remove focus outline from opened modal
outline: none;
outline: 0;
}
// Modal background
+2 -2
View File
@@ -92,7 +92,7 @@
.navbar-collapse {
max-height: @navbar-collapse-max-height;
@media (max-width: @screen-phone) and (orientation: landscape) {
@media (max-width: @screen-xs-min) and (orientation: landscape) {
max-height: 200px;
}
}
@@ -200,7 +200,7 @@
// We remove the `outline` here, but later compensate by attaching `:hover`
// styles to `:focus`.
&:focus {
outline: none;
outline: 0;
}
// Bars