diff options
| author | Mark Otto <[email protected]> | 2013-08-18 15:30:02 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 15:30:02 -0700 |
| commit | 5746979aad4b86dae951ef2120aa4dd1314e7ade (patch) | |
| tree | f712efcadd1637968fdbacd8b33f92c6efed7b7e /less | |
| parent | 9b61b7a72219888ff662186dbe552150497715f9 (diff) | |
| parent | 43271f1ab60e3e2109c56a824ab1f88ff24b51b8 (diff) | |
| download | bootstrap-5746979aad4b86dae951ef2120aa4dd1314e7ade.tar.xz bootstrap-5746979aad4b86dae951ef2120aa4dd1314e7ade.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'less')
| -rw-r--r-- | less/button-groups.less | 10 | ||||
| -rw-r--r-- | less/scaffolding.less | 18 |
2 files changed, 15 insertions, 13 deletions
diff --git a/less/button-groups.less b/less/button-groups.less index 45f2fd0a9..43ada11d9 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -22,11 +22,11 @@ & .btn-default .caret { border-bottom-color: @btn-default-color; } - & .btn-primary, - & .btn-success, - & .btn-warning, - & .btn-danger, - & .btn-info { + .btn-primary, + .btn-success, + .btn-warning, + .btn-danger, + .btn-info { .caret { border-bottom-color: #fff; } diff --git a/less/scaffolding.less b/less/scaffolding.less index 3a6ed3d99..7f6d3bf3a 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -54,14 +54,16 @@ textarea { a { color: @link-color; text-decoration: none; -} -a:hover, -a:focus { - color: @link-hover-color; - text-decoration: underline; -} -a:focus { - .tab-focus(); + + &:hover, + &:focus { + color: @link-hover-color; + text-decoration: underline; + } + + &:focus { + .tab-focus(); + } } |