From: Mark Otto <markdotto@gmail.com>
Date: Tue, 18 Aug 2015 08:06:36 +0000 (-0700)
Subject: fix main docs nav to use latest navbar changes
X-Git-Tag: v4.0.0-alpha~27^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3eecaadb0da012286dec09ea0f4dc784ed2bf22;p=thirdparty%2Fbootstrap.git

fix main docs nav to use latest navbar changes
---

diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html
index e2342d4f45..398f623a7d 100644
--- a/docs/_includes/nav-home.html
+++ b/docs/_includes/nav-home.html
@@ -1,33 +1,31 @@
-<header class="navbar navbar-sm navbar-defeault navbar-static-top bd-navbar" role="banner">
-  <div class="container-fluid">
-    <nav class="nav nav-inline pull-right">
-      <div class="nav-item dropdown">
-        <a class="nav-item nav-link dropdown-toggle" href="#" id="bd-versions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          v{{ site.current_version }}
-        </a>
-        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="bd-versions">
-          <a class="dropdown-item" href="#">v4.0.0-alpha</a>
-          <a class="dropdown-item" href="#">v3.3.5</a>
-          <a class="dropdown-item" href="#">v3.3.4</a>
-          <a class="dropdown-item" href="#">v3.3.2</a>
-          <a class="dropdown-item" href="#">v3.3.1</a>
-          <a class="dropdown-item" href="#">v3.3.0</a>
-          <a class="dropdown-item" href="#">v3.2.0</a>
-          <a class="dropdown-item" href="#">v3.1.1</a>
-          <a class="dropdown-item" href="#">v3.1.0</a>
-          <a class="dropdown-item" href="#">v3.0.3</a>
-          <a class="dropdown-item" href="#">v3.0.2</a>
-          <a class="dropdown-item" href="#">v3.0.1</a>
-          <a class="dropdown-item" href="#">v3.0.0</a>
-        </div>
+<header class="navbar navbar-light navbar-static-top bd-navbar" role="banner">
+  <nav class="nav navbar-nav pull-right">
+    <div class="nav-item dropdown">
+      <a class="nav-item nav-link dropdown-toggle" href="#" id="bd-versions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        v{{ site.current_version }}
+      </a>
+      <div class="dropdown-menu dropdown-menu-right" aria-labelledby="bd-versions">
+        <a class="dropdown-item" href="#">v4.0.0-alpha</a>
+        <a class="dropdown-item" href="#">v3.3.5</a>
+        <a class="dropdown-item" href="#">v3.3.4</a>
+        <a class="dropdown-item" href="#">v3.3.2</a>
+        <a class="dropdown-item" href="#">v3.3.1</a>
+        <a class="dropdown-item" href="#">v3.3.0</a>
+        <a class="dropdown-item" href="#">v3.2.0</a>
+        <a class="dropdown-item" href="#">v3.1.1</a>
+        <a class="dropdown-item" href="#">v3.1.0</a>
+        <a class="dropdown-item" href="#">v3.0.3</a>
+        <a class="dropdown-item" href="#">v3.0.2</a>
+        <a class="dropdown-item" href="#">v3.0.1</a>
+        <a class="dropdown-item" href="#">v3.0.0</a>
       </div>
-    </nav>
-    <nav class="nav nav-inline">
-      <a class="nav-item nav-link {% if page.layout == "home" %}active{% endif %}" href="{{ site.baseurl }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Bootstrap');">Bootstrap</a>
-      <a class="nav-item nav-link {% if page.layout == "docs" %}active{% endif %}" href="{{ site.baseurl }}/getting-started/introduction/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a>
-      <a class="nav-item nav-link {% if page.title == "Examples" %}active{% endif %}" href="{{ site.baseurl }}/examples/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Examples');">Examples</a>
-      <a class="nav-item nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a>
-      <a class="nav-item nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a>
-    </nav>
-  </div>
+    </div>
+  </nav>
+  <nav class="nav navbar-nav">
+    <a class="nav-item nav-link {% if page.layout == "home" %}active{% endif %}" href="{{ site.baseurl }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Bootstrap');">Bootstrap</a>
+    <a class="nav-item nav-link {% if page.layout == "docs" %}active{% endif %}" href="{{ site.baseurl }}/getting-started/introduction/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a>
+    <a class="nav-item nav-link {% if page.title == "Examples" %}active{% endif %}" href="{{ site.baseurl }}/examples/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Examples');">Examples</a>
+    <a class="nav-item nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a>
+    <a class="nav-item nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a>
+  </nav>
 </header>
diff --git a/docs/assets/scss/_nav.scss b/docs/assets/scss/_nav.scss
index 95638014b5..f84a212121 100644
--- a/docs/assets/scss/_nav.scss
+++ b/docs/assets/scss/_nav.scss
@@ -3,23 +3,20 @@
 //
 
 .bd-navbar {
-  padding-top: 1rem;
-  padding-bottom: 1rem;
-  margin-bottom: 0;
-  // background-color: $bd-graphite;
+  .navbar-nav {
+    .nav-link {
+      color: $bd-graphite-light;
 
-  .nav-link {
-    color: $bd-graphite-light;
+      &.active,
+      &:hover,
+      &:focus {
+        color: $gray-dark;
+        background-color: transparent;
+      }
 
-    &.active,
-    &:hover,
-    &:focus {
-      color: $gray-dark;
-      background-color: transparent;
-    }
-
-    &.active {
-      font-weight: 500;
+      &.active {
+        font-weight: 500;
+      }
     }
   }
 }