diff options
| author | Mark Otto <[email protected]> | 2013-08-18 15:43:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 15:43:27 -0700 |
| commit | 7b4e2a9a4a9c3d6dc2298bb7a4cbfd9d86ac32fa (patch) | |
| tree | 55e084b792818900f4db658e60d8ff699e80c4ad /less/theme.less | |
| parent | fe767a18d369080df509377e049b616c0c572dcc (diff) | |
| parent | ef68cf8ebdabccfa4bb9126acdc79f0510b04537 (diff) | |
| download | bootstrap-7b4e2a9a4a9c3d6dc2298bb7a4cbfd9d86ac32fa.tar.xz bootstrap-7b4e2a9a4a9c3d6dc2298bb7a4cbfd9d86ac32fa.zip | |
Merge branch '3.0.0-navbar-default' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-navbar-default
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less/theme.less')
| -rw-r--r-- | less/theme.less | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/less/theme.less b/less/theme.less index f7e503644..d2f98f2fb 100644 --- a/less/theme.less +++ b/less/theme.less @@ -93,13 +93,13 @@ // Basic navbar .navbar { - #gradient > .vertical(@start-color: lighten(@navbar-bg, 10%); @end-color: @navbar-bg;); + #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-bg; + background-color: @navbar-default-bg; } } .navbar-brand, |