From caebfcd246d7a09f311091adf2dbe835dee244b2 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 19 Mar 2017 15:47:34 -0700
Subject: Fix justified nav styles and update nav docs for fill/justify

- Justified and fill nav variants need .nav-item classes on the anchors in addition to .nav-link
- Fix broken styles for the .nav-justified class which wasn't actually doing what we needed it to
---
 scss/_nav.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scss/_nav.scss')

diff --git a/scss/_nav.scss b/scss/_nav.scss
index 7d902a7c0..39f12432d 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -99,7 +99,8 @@
 
 .nav-justified {
   .nav-item {
-    flex: 1 1 100%;
+    flex-grow: 1;
+    flex-basis: 0;
     text-align: center;
   }
 }
-- 
cgit v1.2.3


From 40ac03384de6dc1b6c6e40bd6ff998cb66657346 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 19 Mar 2017 17:47:53 -0700
Subject: linting from before

---
 scss/_nav.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss/_nav.scss')

diff --git a/scss/_nav.scss b/scss/_nav.scss
index 39f12432d..731f1b71b 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -99,8 +99,8 @@
 
 .nav-justified {
   .nav-item {
-    flex-grow: 1;
     flex-basis: 0;
+    flex-grow: 1;
     text-align: center;
   }
 }
-- 
cgit v1.2.3


From a03aaf39df876691e4ba6acb0b40e9790e4c7127 Mon Sep 17 00:00:00 2001
From: Pierre-Denis Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Date: Sat, 14 Jan 2017 01:52:05 -0500
Subject: Harmonize navbar-brand, navbar-text and nav-link height

---
 scss/_nav.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss/_nav.scss')

diff --git a/scss/_nav.scss b/scss/_nav.scss
index 731f1b71b..58e71eca4 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -13,7 +13,7 @@
 
 .nav-link {
   display: block;
-  padding: $nav-link-padding;
+  padding: $nav-link-padding-y $nav-link-padding-x;
 
   @include hover-focus {
     text-decoration: none;
-- 
cgit v1.2.3


From 91b62941afb7115807fc2925398ebccfc68f5377 Mon Sep 17 00:00:00 2001
From: Pierre Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Date: Sun, 2 Apr 2017 05:21:04 -0400
Subject: Tabs/Scrollspy/.nav/.list-group/.active independent of markup (<nav>,
 .nav-item, <li> etc...)

---
 scss/_nav.scss | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'scss/_nav.scss')

diff --git a/scss/_nav.scss b/scss/_nav.scss
index 58e71eca4..639193261 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -26,7 +26,6 @@
   }
 }
 
-
 //
 // Tabs
 //
@@ -34,10 +33,15 @@
 .nav-tabs {
   border-bottom: $nav-tabs-border-width solid $nav-tabs-border-color;
 
-  .nav-item {
+  .nav-item,
+  .nav-link {
     margin-bottom: -$nav-tabs-border-width;
   }
 
+  .nav-item .nav-link {
+    margin-bottom: 0;
+  }
+
   .nav-link {
     border: $nav-tabs-border-width solid transparent;
     @include border-top-radius($nav-tabs-border-radius);
@@ -76,12 +80,12 @@
 .nav-pills {
   .nav-link {
     @include border-radius($nav-pills-border-radius);
-  }
 
-  .nav-link.active,
-  .nav-item.show .nav-link {
-    color: $nav-pills-active-link-color;
-    background-color: $nav-pills-active-link-bg;
+    &.active,
+    .show & {
+      color: $nav-pills-active-link-color;
+      background-color: $nav-pills-active-link-bg;
+    }
   }
 }
 
-- 
cgit v1.2.3


From 9a475730dc62a5632350d74387e187c205881a45 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sat, 8 Apr 2017 13:58:20 -0700
Subject: Docs and CSS updates for #21807 (#22336)

* tweak some copy
* fix up scrollspy docs
* remove nav styles that were added
* fix nav-based docs by requiring .nav-item on .nav-link
---
 scss/_nav.scss | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'scss/_nav.scss')

diff --git a/scss/_nav.scss b/scss/_nav.scss
index 639193261..2b6b2a7f3 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -33,15 +33,10 @@
 .nav-tabs {
   border-bottom: $nav-tabs-border-width solid $nav-tabs-border-color;
 
-  .nav-item,
-  .nav-link {
+  .nav-item {
     margin-bottom: -$nav-tabs-border-width;
   }
 
-  .nav-item .nav-link {
-    margin-bottom: 0;
-  }
-
   .nav-link {
     border: $nav-tabs-border-width solid transparent;
     @include border-top-radius($nav-tabs-border-radius);
-- 
cgit v1.2.3