From 28ba9d69c82895bbd9a1d66cea855119f4aba349 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 11:21:39 -0800 Subject: nav, buttons, and docs updates to account for outline: 0; on :active --- less/button-groups.less | 7 +++++++ less/buttons.less | 1 + less/dropdowns.less | 6 +++++- less/mixins.less | 4 ---- 4 files changed, 13 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index 3e08e6b09..7367103ca 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -78,6 +78,13 @@ z-index: 2; } +// On active and open, don't show outline +.btn-group .dropdown-toggle:active, +.btn-group.open .dropdown-toggle { + outline: 0; +} + + // Split button dropdowns // ---------------------- diff --git a/less/buttons.less b/less/buttons.less index f1060dc6b..54d00a13a 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -88,6 +88,7 @@ background-color: darken(@white, 10%); background-color: darken(@white, 15%) e("\9"); color: rgba(0,0,0,.5); + outline: 0; } &.disabled, &[disabled] { diff --git a/less/dropdowns.less b/less/dropdowns.less index e73b056e9..83f535ae8 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -5,10 +5,14 @@ .dropdown { position: relative; } -.dropdown .dropdown-toggle { +.dropdown-toggle { // The caret makes the toggle a bit too tall in IE7 *margin-bottom: -3px; } +.dropdown-toggle:active, +.open .dropdown-toggle { + outline: 0; +} // Dropdown arrow/caret .caret { display: inline-block; diff --git a/less/mixins.less b/less/mixins.less index 2ed28ac3f..ddf100359 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -29,10 +29,6 @@ // Webkit outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; - // Firefox - -moz-outline: 5px auto -moz-mac-focusring; - -moz-outline-radius: 6px; - -moz-outline-offset: 0; } // Center-align a block level element -- cgit v1.2.3