diff options
| author | Mark Otto <[email protected]> | 2013-08-23 14:00:28 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-23 14:00:28 -0700 |
| commit | 310642d5acd3b6c3f80f758c854b12a2de4cdeb6 (patch) | |
| tree | 82a514fc15a8a930904328f9531286ccebe64e9c /less | |
| parent | bbc32f7e7993cd36190e458b47fc333174a9992e (diff) | |
| parent | 7b0d035dd4cea21bcbd01c3d16764a90e9ce009b (diff) | |
| download | bootstrap-310642d5acd3b6c3f80f758c854b12a2de4cdeb6.tar.xz bootstrap-310642d5acd3b6c3f80f758c854b12a2de4cdeb6.zip | |
Merge branch 'master' into header-font-size-vars
Diffstat (limited to 'less')
| -rw-r--r-- | less/mixins.less | 3 | ||||
| -rw-r--r-- | less/theme.less | 25 |
2 files changed, 19 insertions, 9 deletions
diff --git a/less/mixins.less b/less/mixins.less index 3f230205b..c18e7c49b 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -393,7 +393,8 @@ .table-hover > tbody > tr { > td.@{state}:hover, > th.@{state}:hover, - &.@{state}:hover > td { + &.@{state}:hover > td, + &.@{state}:hover > th { background-color: darken(@background, 5%); border-color: darken(@border, 5%); } diff --git a/less/theme.less b/less/theme.less index 92469c429..32c806696 100644 --- a/less/theme.less +++ b/less/theme.less @@ -32,13 +32,20 @@ // Mixin for generating new styles .btn-styles(@btn-color: #555;) { - #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 10%)); - border-color: darken(@btn-color, 12%); + #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%)); + background-repeat: repeat-x; + border-color: darken(@btn-color, 14%); + + &:hover, + &:focus { + background-color: darken(@btn-color, 12%); + background-position: 0 -15px; + } &:active, &.active { - background-color: darken(@btn-color, 10%); - border-color: darken(@btn-color, 12%); + background-color: darken(@btn-color, 12%); + border-color: darken(@btn-color, 14%); } } @@ -91,15 +98,16 @@ // Navbar // -------------------------------------------------- -// Basic navbar -.navbar { +// Default navbar +.navbar-default { #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg;); border-radius: @navbar-border-radius; @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075); .box-shadow(@shadow); .navbar-nav > .active > a { - background-color: @navbar-default-bg; + #gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%);); + .box-shadow(inset 0 3px 9px rgba(0,0,0,.075)); } } .navbar-brand, @@ -112,7 +120,8 @@ #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg;); .navbar-nav > .active > a { - background-color: @navbar-inverse-bg; + #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%);); + .box-shadow(inset 0 3px 9px rgba(0,0,0,.25)); } .navbar-brand, |