From a41d566d5e38dd3227a0f5921f7be92969ff63f1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 14 May 2013 22:08:56 -0700 Subject: [PATCH] margin on bottom of navbar nav by default, also round links in mobile views (unround in desktop) --- docs/assets/css/bootstrap.css | 6 ++++++ less/navbar.less | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4a1324b6ba..354dd25fe4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3387,6 +3387,7 @@ button.close { .navbar-nav { margin-top: 10px; + margin-bottom: 15px; } .navbar-nav > li > a { @@ -3394,6 +3395,7 @@ button.close { padding-bottom: 15px; line-height: 20px; color: #777777; + border-radius: 4px; } .navbar-nav > li > a:hover, @@ -3634,10 +3636,14 @@ button.close { .navbar .nav { float: left; margin-top: 0; + margin-bottom: 0; } .navbar .nav > li { float: left; } + .navbar .nav > li > a { + border-radius: 0; + } .navbar .nav.pull-right { float: right; } diff --git a/less/navbar.less b/less/navbar.less index 86768962dd..13a36781e1 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -22,12 +22,14 @@ // Space out from .navbar .brand and .btn-navbar when stacked in mobile views // and outdent nav links so text lines up with logo. margin-top: 10px; + margin-bottom: 15px; > li > a { padding-top: ((@navbar-height - @line-height-computed) / 2); padding-bottom: ((@navbar-height - @line-height-computed) / 2); color: @navbar-link-color; line-height: 20px; + border-radius: @border-radius-base; } > li > a:hover, > li > a:focus { @@ -281,10 +283,15 @@ } .navbar .nav { float: left; - margin-top: 0; // undo top margin to make nav extend full height of navbar + // undo margin to make nav extend full height of navbar + margin-top: 0; + margin-bottom: 0; > li { float: left; + > a { + border-radius: 0; + } } &.pull-right {