diff options
| author | Mark Otto <[email protected]> | 2013-08-18 19:02:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 19:02:42 -0700 |
| commit | 9dcae610e97c5422652d7212fda5985de1653d4c (patch) | |
| tree | 03f5f15fb5d3a1561f69ce97a1a9f651e816330c /less/theme.less | |
| parent | 578a14e14aa7c6ad37f307d5d78e9a2afb0e7bfb (diff) | |
| parent | 5bd2d7ed7e5a2bae56de81bf550f2e4b1451ab25 (diff) | |
| download | bootstrap-9dcae610e97c5422652d7212fda5985de1653d4c.tar.xz bootstrap-9dcae610e97c5422652d7212fda5985de1653d4c.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
customize.html
examples/justified-nav/justified-nav.css
Diffstat (limited to 'less/theme.less')
| -rw-r--r-- | less/theme.less | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/less/theme.less b/less/theme.less index 52e2d239a..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;); - border-radius: @border-radius-base; + #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, |