diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-12-08 02:18:32 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-12-08 02:18:32 +0300 |
| commit | 5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4 (patch) | |
| tree | 2951782d8d0aadb61dae9122d0f508a75ed8e7eb /scss/_nav.scss | |
| parent | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (diff) | |
| parent | afbaf4350560eaf2135fb0dc6dd761ebb746ac40 (diff) | |
| download | bootstrap-5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4.tar.xz bootstrap-5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into patch-1
Diffstat (limited to 'scss/_nav.scss')
| -rw-r--r-- | scss/_nav.scss | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scss/_nav.scss b/scss/_nav.scss index 551f3c9cd..f7b83c68d 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -32,6 +32,11 @@ // Nav inline .nav-inline { + .nav-item { + display: inline-block; + } + + .nav-item + .nav-item, .nav-link + .nav-link { margin-left: 1rem; } @@ -59,7 +64,7 @@ .nav-link { display: block; padding: $nav-link-padding; - border: 1px solid transparent; + border: $nav-tabs-link-border-width solid transparent; @include border-radius($border-radius $border-radius 0 0); @include hover-focus { @@ -91,6 +96,8 @@ // .nav-pills { + @include clearfix(); + .nav-item { float: left; |