diff options
| author | Mark Otto <[email protected]> | 2013-08-18 15:47:29 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 15:47:29 -0700 |
| commit | c240460f0b38ab2a2bc4f542695a4ca4e1748487 (patch) | |
| tree | 35641cecac7a46779c1c996ffcc5048a14700740 /less/theme.less | |
| parent | fa7cc6cafda4f5a9363d17507bf91cba22777749 (diff) | |
| parent | 638db635d7b0c2bd6406d5ff891e92985e4b839b (diff) | |
| download | bootstrap-c240460f0b38ab2a2bc4f542695a4ca4e1748487.tar.xz bootstrap-c240460f0b38ab2a2bc4f542695a4ca4e1748487.zip | |
Merge branch '3.0.0-wip' into glyphicons-LESS-fixes
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, |