diff options
| author | Mark Otto <[email protected]> | 2013-10-20 19:55:56 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-20 19:55:56 -0700 |
| commit | 369f5ba760993001fe6c4cc56ee3cf0327c3395d (patch) | |
| tree | c462c6071aa0601fa505df6ab82292991103f19b /less | |
| parent | dd34102cb6bb601c3103f2c74804d2382271c0e1 (diff) | |
| parent | 976f6dfdad663e43237a3da07cb64a41932f264e (diff) | |
| download | bootstrap-369f5ba760993001fe6c4cc56ee3cf0327c3395d.tar.xz bootstrap-369f5ba760993001fe6c4cc56ee3cf0327c3395d.zip | |
Merge branch 'master' of https://github.com/jeonghwan-kim/bootstrap into jeonghwan-kim-master
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less')
| -rw-r--r-- | less/navbar.less | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/less/navbar.less b/less/navbar.less index d054b400d..cc3e1f213 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -128,7 +128,6 @@ position: fixed; right: 0; left: 0; - border-width: 0 0 1px; // Undo the rounded corners @media (min-width: @grid-float-breakpoint) { @@ -138,10 +137,12 @@ .navbar-fixed-top { z-index: @zindex-navbar-fixed; top: 0; + border-width: 0 0 1px; } .navbar-fixed-bottom { bottom: 0; margin-bottom: 0; // override .navbar defaults + border-width: 1px 0 0; } |