mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
nav, buttons, and docs updates to account for outline: 0; on :active
This commit is contained in:
parent
d65ce1b64c
commit
28ba9d69c8
6 changed files with 36 additions and 17 deletions
18
docs/assets/css/bootstrap.css
vendored
18
docs/assets/css/bootstrap.css
vendored
|
@ -36,9 +36,6 @@ a:focus {
|
|||
outline: thin dotted;
|
||||
outline: 5px auto -webkit-focus-ring-color;
|
||||
outline-offset: -2px;
|
||||
-moz-outline: 5px auto -moz-mac-focusring;
|
||||
-moz-outline-radius: 6px;
|
||||
-moz-outline-offset: 0;
|
||||
}
|
||||
a:hover, a:active {
|
||||
outline: 0;
|
||||
|
@ -627,9 +624,6 @@ input[type="file"]:focus, input[type="checkbox"]:focus, select:focus {
|
|||
outline: thin dotted;
|
||||
outline: 5px auto -webkit-focus-ring-color;
|
||||
outline-offset: -2px;
|
||||
-moz-outline: 5px auto -moz-mac-focusring;
|
||||
-moz-outline-radius: 6px;
|
||||
-moz-outline-offset: 0;
|
||||
}
|
||||
.input-mini {
|
||||
width: 60px;
|
||||
|
@ -1490,9 +1484,12 @@ table .span12 {
|
|||
.dropdown {
|
||||
position: relative;
|
||||
}
|
||||
.dropdown .dropdown-toggle {
|
||||
.dropdown-toggle {
|
||||
*margin-bottom: -3px;
|
||||
}
|
||||
.dropdown-toggle:active, .open .dropdown-toggle {
|
||||
outline: 0;
|
||||
}
|
||||
.caret {
|
||||
display: inline-block;
|
||||
width: 0;
|
||||
|
@ -2641,9 +2638,6 @@ table .span12 {
|
|||
outline: thin dotted;
|
||||
outline: 5px auto -webkit-focus-ring-color;
|
||||
outline-offset: -2px;
|
||||
-moz-outline: 5px auto -moz-mac-focusring;
|
||||
-moz-outline-radius: 6px;
|
||||
-moz-outline-offset: 0;
|
||||
}
|
||||
.btn.active, .btn:active {
|
||||
background-image: none;
|
||||
|
@ -2653,6 +2647,7 @@ table .span12 {
|
|||
background-color: #e6e6e6;
|
||||
background-color: #d9d9d9 \9;
|
||||
color: rgba(0, 0, 0, 0.5);
|
||||
outline: 0;
|
||||
}
|
||||
.btn.disabled, .btn[disabled] {
|
||||
cursor: default;
|
||||
|
@ -2776,6 +2771,9 @@ button.btn.small, input[type="submit"].btn.small {
|
|||
.btn-group .btn.active {
|
||||
z-index: 2;
|
||||
}
|
||||
.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle {
|
||||
outline: 0;
|
||||
}
|
||||
.btn-group .dropdown-toggle {
|
||||
padding-left: 8px;
|
||||
padding-right: 8px;
|
||||
|
|
|
@ -173,10 +173,9 @@ hr.soften {
|
|||
}
|
||||
.subnav .nav > li > a {
|
||||
margin: 0;
|
||||
padding-top: 11px;
|
||||
padding-top: 11px;
|
||||
padding-bottom: 11px;
|
||||
font-size: 13px;
|
||||
text-shadow: 0 1px 0 rgba(255,255,255,.5);
|
||||
border-left: 1px solid #f5f5f5;
|
||||
border-right: 1px solid #e5e5e5;
|
||||
-webkit-border-radius: 0;
|
||||
|
@ -202,10 +201,18 @@ hr.soften {
|
|||
.subnav .nav > li:first-child > a:hover {
|
||||
border-left: 0;
|
||||
padding-left: 12px;
|
||||
-webkit-border-radius: 4px 0 0 4px;
|
||||
-moz-border-radius: 4px 0 0 4px;
|
||||
border-radius: 4px 0 0 4px;
|
||||
}
|
||||
.subnav .nav > li:last-child > a {
|
||||
border-right: 0;
|
||||
}
|
||||
.subnav .dropdown-menu {
|
||||
-webkit-border-radius: 0 0 4px 4px;
|
||||
-moz-border-radius: 0 0 4px 4px;
|
||||
border-radius: 0 0 4px 4px;
|
||||
}
|
||||
|
||||
/* Fixed subnav on scroll, but only for 940px and up (sorry IE!) */
|
||||
@media (min-width: 940px) {
|
||||
|
@ -229,6 +236,12 @@ hr.soften {
|
|||
margin: 0 auto;
|
||||
padding: 0 1px;
|
||||
}
|
||||
.subnav .nav > li:first-child > a,
|
||||
.subnav .nav > li:first-child > a:hover {
|
||||
-webkit-border-radius: 0;
|
||||
-moz-border-radius: 0;
|
||||
border-radius: 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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
|
||||
// ----------------------
|
||||
|
|
|
@ -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] {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue