diff options
| author | Mark Otto <[email protected]> | 2014-03-10 00:08:29 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-10 00:08:29 -0700 |
| commit | a36643dd338537a9b4319fbab6e1dbf2e7d1cf9c (patch) | |
| tree | a097e839bc115709770b6e1b533a63bf653e58f0 /less | |
| parent | 3a2d6e40503019823bf197f278681e830bc14f31 (diff) | |
| parent | 6dd51fab44df852697564f6257403b57f85f492b (diff) | |
| download | bootstrap-a36643dd338537a9b4319fbab6e1dbf2e7d1cf9c.tar.xz bootstrap-a36643dd338537a9b4319fbab6e1dbf2e7d1cf9c.zip | |
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
Diffstat (limited to 'less')
| -rw-r--r-- | less/button-groups.less | 2 | ||||
| -rw-r--r-- | less/carousel.less | 2 | ||||
| -rw-r--r-- | less/modals.less | 2 | ||||
| -rw-r--r-- | less/navbar.less | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/less/button-groups.less b/less/button-groups.less index ff95b0474..ef11cf12a 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -20,7 +20,7 @@ } &:focus { // Remove focus outline when dropdown JS adds it after closing the menu - outline: none; + outline: 0; } } } diff --git a/less/carousel.less b/less/carousel.less index e3fb8a2cf..6f5023756 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -91,7 +91,7 @@ // Hover/focus state &:hover, &:focus { - outline: none; + outline: 0; color: @carousel-control-color; text-decoration: none; .opacity(.9); diff --git a/less/modals.less b/less/modals.less index 0ba977e6d..8438a1616 100644 --- a/less/modals.less +++ b/less/modals.less @@ -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 diff --git a/less/navbar.less b/less/navbar.less index 6ddf26356..b5e9a5f8d 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -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 |