From a426c4951cf34d20469484e642b7416867b29a9c Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Fri, 8 Jul 2016 09:54:53 +0100
Subject: remove navbar-toggler unicode symbol in HTML

remove current HTML-based symbol, add any missing aria-* attributes
---
 docs/_includes/nav-home.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html
index 0436e2dbe..a5a3088c7 100644
--- a/docs/_includes/nav-home.html
+++ b/docs/_includes/nav-home.html
@@ -27,9 +27,7 @@
 
     <nav>
       <div class="clearfix">
-        <button class="navbar-toggler pull-xs-right hidden-sm-up" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation">
-          &#9776;
-        </button>
+        <button class="navbar-toggler pull-xs-right hidden-sm-up" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation"></button>
         <a class="navbar-brand hidden-sm-up" href="{{ site.baseurl }}/">
           Bootstrap
         </a>
-- 
cgit v1.2.3


From 076a950442371a8c0a974fa6478efb20a69527b7 Mon Sep 17 00:00:00 2001
From: Kovah <mail@kovah.de>
Date: Fri, 9 Sep 2016 06:48:17 +0200
Subject: Docs: Breaks out Utilities into separate section and optimizes its
 pages (#20678)

---
 docs/_includes/page-headers.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'docs/_includes')

diff --git a/docs/_includes/page-headers.html b/docs/_includes/page-headers.html
index 26f5f95b1..50b59a982 100644
--- a/docs/_includes/page-headers.html
+++ b/docs/_includes/page-headers.html
@@ -18,6 +18,11 @@
   <p class="lead">
     Over a dozen reusable components built to provide buttons, dropdowns, input groups, navigation, alerts, and much more.
   </p>
+{% elsif page.group == "utilities" %}
+  <h1>Utilities</h1>
+  <p class="lead">
+    Bootstrap includes dozens of utilities—classes with a single purpose to reduce the frequency of highly repetitive declarations.
+  </p>
 {% elsif page.group == "javascript" %}
   <h1>JavaScript plugins</h1>
   <p class="lead">
-- 
cgit v1.2.3


From 3dc4b3647ce2b27b0216fe8103253ffe9633fde9 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 26 Sep 2016 00:54:10 -0700
Subject: Rename pull-*-{left|right} classes to .float-*-left and
 .float-*-right

---
 docs/_includes/nav-home.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html
index 0436e2dbe..a0f16e9b5 100644
--- a/docs/_includes/nav-home.html
+++ b/docs/_includes/nav-home.html
@@ -1,7 +1,7 @@
 <header class="navbar navbar-light navbar-static-top bd-navbar">
   <div class="container">
     {% comment %}
-    <nav class="nav navbar-nav pull-xs-right">
+    <nav class="nav navbar-nav float-xs-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 }}
@@ -27,7 +27,7 @@
 
     <nav>
       <div class="clearfix">
-        <button class="navbar-toggler pull-xs-right hidden-sm-up" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation">
+        <button class="navbar-toggler float-xs-right hidden-sm-up" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation">
           &#9776;
         </button>
         <a class="navbar-brand hidden-sm-up" href="{{ site.baseurl }}/">
-- 
cgit v1.2.3


From 7bf868a709d5e278048f7fe5fd62d2fa9365d5bc Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sun, 2 Oct 2016 18:19:47 -0700
Subject: v4: Social meta tags (#20825)

* descriptions for getting started pages

* descriptions for layout

* add content page descriptions

* more descriptions, updates to some existing ones

* correct site url

* add social stuff to config for twitter cards

* add twitter meta tags; use large image for homepage and regular card for all others

* add the assets

* more site config

* more social shiz to partial, remove existing meta for the partial, remove page title from homepage for simpler if statements
---
 docs/_includes/header.html | 10 +++++-----
 docs/_includes/social.html | 31 +++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 docs/_includes/social.html

(limited to 'docs/_includes')

diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index 3fc75c058..54bfddf69 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -1,17 +1,17 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-<meta name="description" content="Bootstrap, a sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.">
-<meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors">
 
 <title>
-  {% if page.layout == "home" %}
-    {{ page.title }}
+  {% if page.title %}
+    {{ page.title }} &middot; {{ site.title }}
   {% else %}
-    {{ page.title }} &middot; Bootstrap
+    {{ site.title }} &middot; {{ site.description }}
   {% endif %}
 </title>
 
+{% include social.html %}
+
 <!-- Bootstrap core CSS -->
 {% if site.github %}
   <link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet">
diff --git a/docs/_includes/social.html b/docs/_includes/social.html
new file mode 100644
index 000000000..c488ea610
--- /dev/null
+++ b/docs/_includes/social.html
@@ -0,0 +1,31 @@
+<!-- Twitter -->
+<meta name="twitter:site" content="@{{ site.twitter }}">
+<meta name="twitter:creator" content="@{{ site.twitter }}">
+
+{% if page.title %}
+  <meta name="twitter:card" content="summary">
+  <meta name="twitter:title" content="{{ page.title }}">
+  <meta name="twitter:description" content="{{ page.description }}">
+  <meta name="twitter:image" content="{{ site.url }}{{ site.social_logo_path }}">
+{% else %}
+  <meta name="twitter:card" content="summary_large_image">
+  <meta name="twitter:title" content="{{ site.title }}">
+  <meta name="twitter:description" content="{{ site.description }}">
+  <meta name="twitter:image" content="{{ site.url }}{{ site.social_image_path }}">
+{% endif %}
+
+<!-- Facebook -->
+{% if page.title %}
+  <meta property="og:url" content="{{ site.url }}{{ page.url }}">
+  <meta property="og:title" content="{{ page.title }}">
+  <meta property="og:description" content="{{ page.description }}">
+{% else %}
+  <meta property="og:url" content="{{ site.url }}">
+  <meta property="og:title" content="{{ site.title }}">
+  <meta property="og:description" content="{{ site.description }}">
+{% endif %}
+<meta property="og:image" content="{{ site.url }}{{ site.social_image_path }}">
+
+<!-- Meta -->
+<meta name="description" content="{{ site.description }}">
+<meta name="author" content="{{ site.authors }}">
-- 
cgit v1.2.3


From 2e69dfa8c1679238579ef6f5ec85deb755e4fb6d Mon Sep 17 00:00:00 2001
From: Bardi Harborow <bardi@bardiharborow.com>
Date: Tue, 4 Oct 2016 02:55:59 +1000
Subject: Fix broken/redirected links, moving to HTTPS where possible. (#20557)

---
 docs/_includes/nav-docs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/nav-docs.html b/docs/_includes/nav-docs.html
index b4f4d1f9e..f9a7554f0 100644
--- a/docs/_includes/nav-docs.html
+++ b/docs/_includes/nav-docs.html
@@ -33,7 +33,7 @@
           {% endif %}
 
           <li class="{{ active }}">
-            <a href="{{ site.baseurl }}/{{ group.title | downcase | replace: ' ', '-' }}/{{ doc.title | downcase | replace: ' ', '-' | replace:'-&-','-' }}">
+            <a href="{{ site.baseurl }}/{{ group.title | downcase | replace: ' ', '-' }}/{{ doc.title | downcase | replace: ' ', '-' | replace:'-&-','-' }}/">
               {{ doc.title }}
             </a>
 
-- 
cgit v1.2.3


From 76af99eb4a5e2af6996ada4e61e4e7a386ca81d5 Mon Sep 17 00:00:00 2001
From: Christian Oliff <christianoliff@yahoo.com>
Date: Wed, 19 Oct 2016 23:35:10 +0900
Subject: Update Google Analytics snippet to always load via HTTPS

This is the official Google Analytics snippet.
---
 docs/_includes/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index 54bfddf69..37e27cd07 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -33,7 +33,7 @@
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
   m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
   ga('create', 'UA-146052-10', 'getbootstrap.com');
   ga('send', 'pageview');
 </script>
-- 
cgit v1.2.3


From b4dbc69f0edba28ea1a9be4aacb3e9f68c3604a9 Mon Sep 17 00:00:00 2001
From: Bardi Harborow <bardi@bardiharborow.com>
Date: Tue, 8 Nov 2016 23:36:04 +1100
Subject: Fix broken and redirected links.

---
 docs/_includes/nav-docs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/nav-docs.html b/docs/_includes/nav-docs.html
index f9a7554f0..005f96435 100644
--- a/docs/_includes/nav-docs.html
+++ b/docs/_includes/nav-docs.html
@@ -17,7 +17,7 @@
     {% if slug == "examples" %}
         <a class="bd-toc-link" href="{{ site.baseurl }}/{{ group.title | downcase | replace: ' ', '-' }}/">
       {% else %}
-        <a class="bd-toc-link" href="{{ site.baseurl }}/{{ group.title | downcase | replace: ' ', '-' }}/{{ link.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-'  }}">
+        <a class="bd-toc-link" href="{{ site.baseurl }}/{{ group.title | downcase | replace: ' ', '-' }}/{{ link.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-'  }}{% if link.title || page.title %}/{% endif %}">
       {% endif %}
         {{ group.title }}
       </a>
-- 
cgit v1.2.3


From 54908a95a87b592d81df3231823979c75917d57a Mon Sep 17 00:00:00 2001
From: Starsam80 <samraskauskas@gmail.com>
Date: Sun, 27 Nov 2016 23:23:12 -0700
Subject: Rename `.navbar-toggleable-xs` to `.navbar-toggleable` + more cleanup
 (#21226)

* Clean up some utilities

- Align CSS properties
- In `_spacing.scss`, we had a comment saying what 'a' was for, but we removed that so this comment no longer applies

* Remove '-xs' from `.navbar-toggleable-xs` and remove duplication

* Fix outdated classes to use newer ones
---
 docs/_includes/nav-home.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html
index 6dd3723f6..8ba41c7b4 100644
--- a/docs/_includes/nav-home.html
+++ b/docs/_includes/nav-home.html
@@ -1,7 +1,7 @@
 <header class="navbar navbar-light navbar-static-top bd-navbar">
   <div class="container">
     {% comment %}
-    <nav class="nav navbar-nav float-xs-right">
+    <nav class="nav navbar-nav float-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 }}
@@ -27,12 +27,12 @@
 
     <nav>
       <div class="clearfix">
-        <button class="navbar-toggler float-xs-right hidden-sm-up" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation"></button>
+        <button class="navbar-toggler float-right hidden-sm-up" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation"></button>
         <a class="navbar-brand hidden-sm-up" href="{{ site.baseurl }}/">
           Bootstrap
         </a>
       </div>
-      <div class="collapse navbar-toggleable-xs" id="bd-main-nav">
+      <div class="collapse navbar-toggleable" id="bd-main-nav">
         <ul class="nav navbar-nav">
           <li class="nav-item active">
             <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>
-- 
cgit v1.2.3


From a3567a119df3434d879f766e18ba452b01871d37 Mon Sep 17 00:00:00 2001
From: Bardi Harborow <bardi@bardiharborow.com>
Date: Mon, 5 Dec 2016 11:44:37 +1100
Subject: Documentation navigation fixes. (#21288)

* Make /utilities/ redirect to /utilities/borders/.

* Rewrite sidebar active link logic to ensure superstrings are not selected.
---
 docs/_includes/nav-docs.html | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/nav-docs.html b/docs/_includes/nav-docs.html
index 005f96435..2b44c8acc 100644
--- a/docs/_includes/nav-docs.html
+++ b/docs/_includes/nav-docs.html
@@ -4,36 +4,33 @@
 </form>
 
 <nav class="bd-links" id="docsNavbarContent">
+  {% assign page_slug = page.url | split: '/' | last %}
   {% for group in site.data.nav %}
   {% assign link = group.pages | first %}
-  {% assign slug = group.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' %}
+  {% assign link_slug = link.title | slugify %}
+  {% assign group_slug = group.title | slugify %}
   {% assign active = nil %}
 
-  {% if page.url contains slug %}
+  {% if page.group == group_slug %}
     {% assign active = 'active' %}
   {% endif %}
 
   <div class="bd-toc-item {{ active }}">
-    {% if slug == "examples" %}
-        <a class="bd-toc-link" href="{{ site.baseurl }}/{{ group.title | downcase | replace: ' ', '-' }}/">
-      {% else %}
-        <a class="bd-toc-link" href="{{ site.baseurl }}/{{ group.title | downcase | replace: ' ', '-' }}/{{ link.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-'  }}{% if link.title || page.title %}/{% endif %}">
-      {% endif %}
+      <a class="bd-toc-link" href="{{ site.baseurl }}/{{ group_slug }}/{{ link_slug }}{% if link_slug %}/{% endif %}">
         {{ group.title }}
       </a>
 
       <ul class="nav bd-sidenav">
         {% for doc in group.pages %}
-          {% assign slug = doc.title | downcase | replace: ' ', '-' | replace:'-&-','-' %}
-          {% capture slug %}/{{ slug }}{% endcapture %}
+          {% assign doc_slug = doc.title | slugify %}
           {% assign active = nil %}
 
-          {% if page.url contains slug %}
+          {% if page.group == group_slug and page_slug == doc_slug %}
             {% assign active = 'active bd-sidenav-active' %}
           {% endif %}
 
           <li class="{{ active }}">
-            <a href="{{ site.baseurl }}/{{ group.title | downcase | replace: ' ', '-' }}/{{ doc.title | downcase | replace: ' ', '-' | replace:'-&-','-' }}/">
+            <a href="{{ site.baseurl }}/{{ group_slug }}/{{ doc_slug }}/">
               {{ doc.title }}
             </a>
 
-- 
cgit v1.2.3


From eb2e1102be0f4641ee3e5c4e7853360d5a04e3d8 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Wed, 21 Dec 2016 20:26:17 -0800
Subject: Flexbox all the time (Drop IE9 support and remove $enable-flex
 option) (#21389)

* remove the $enable-flex variable option

* remove bootstrap-flex.css dist file and it's grunt task

* remove the separate flex css file for docs; it's all the same now

* remove flexbox docs (porting some to the main grid docs in next commit)

* clean up few grid docs bits to simplify copy, start to mention flexbox

* port relevant flexbox-grid.md content to grid.md

- clean up mixins
- update how it works section
- bring over sizing and alignment sections

* remove the $enable-flex from the options.md page

* update lead paragraph to mention flexbox

* update migration to mention loss of ie9 support

* remove mention of flexbox dist file

* clarify IE support

* making a note

* remove flexbox variant mentions from component docs

- updates docs for media object, navs, list group, and cards to consolidate docs
- no more need to callout flexbox variants since it's now the default

* remove $enable-flex if/else from sass files

* remove flex dist files

* update scss lint property order to account for flex properties

* linting

* change to numberless classes for autosizing, wrap in highlighting div

* bump gruntfile and postcss to ie10

* redo intro sections

* rearrange

* phew, redo hella grid docs

- rearrange all the things
- consolidate some bits

* remove reference to flexbox mode

* more border action for demo

* Make some changes to the .card's in .card-deck's to ensure footers align to the bottom
---
 docs/_includes/header.html | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index 37e27cd07..11076af46 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -15,9 +15,6 @@
 <!-- Bootstrap core CSS -->
 {% if site.github %}
   <link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet">
-  {% if page.title == "Flexbox grid system" %}
-    <link href="{{ site.baseurl }}/assets/css/docs-flexbox.min.css" rel="stylesheet">
-  {% endif %}
 {% else %}
   <link href="{{ site.baseurl }}/dist/css/bootstrap.css" rel="stylesheet">
 {% endif %}
-- 
cgit v1.2.3


From df566160e76b7383cd6c9448d8867b7b1a1913c9 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 21 Dec 2016 22:11:04 -0800
Subject: put new toggler markup to use

---
 docs/_includes/nav-home.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html
index 8ba41c7b4..f77f02084 100644
--- a/docs/_includes/nav-home.html
+++ b/docs/_includes/nav-home.html
@@ -27,7 +27,9 @@
 
     <nav>
       <div class="clearfix">
-        <button class="navbar-toggler float-right hidden-sm-up" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation"></button>
+        <button class="navbar-toggler float-right hidden-sm-up" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon"></span>
+        </button>
         <a class="navbar-brand hidden-sm-up" href="{{ site.baseurl }}/">
           Bootstrap
         </a>
-- 
cgit v1.2.3


From d86a1dbfd486a9714aefe59f54fc10075ad1dfbd Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Thu, 22 Dec 2016 09:12:43 -0800
Subject: redo custom docs navbar

---
 docs/_includes/nav-home.html | 69 ++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html
index f77f02084..e325d8605 100644
--- a/docs/_includes/nav-home.html
+++ b/docs/_includes/nav-home.html
@@ -1,5 +1,5 @@
-<header class="navbar navbar-light navbar-static-top bd-navbar">
-  <div class="container">
+<header class="navbar navbar-light navbar-toggleable-md bd-navbar">
+  <nav class="container">
     {% comment %}
     <nav class="nav navbar-nav float-right">
       <div class="nav-item dropdown">
@@ -25,37 +25,36 @@
     </nav>
     {% endcomment %}
 
-    <nav>
-      <div class="clearfix">
-        <button class="navbar-toggler float-right hidden-sm-up" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation">
-          <span class="navbar-toggler-icon"></span>
-        </button>
-        <a class="navbar-brand hidden-sm-up" href="{{ site.baseurl }}/">
-          Bootstrap
-        </a>
-      </div>
-      <div class="collapse navbar-toggleable" id="bd-main-nav">
-        <ul class="nav navbar-nav">
-          <li class="nav-item active">
-            <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>
-          </li>
-          <li class="nav-item">
-            <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>
-          </li>
-          <li class="nav-item">
-            <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>
-          </li>
-          <li class="nav-item">
-            <a class="nav-item nav-link" href="{{ site.themes }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Themes');">Themes</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-item nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-item nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a>
-          </li>
-        </ul>
-      </div>
-    </nav>
-  </div>
+    <div class="d-flex flex-items-between hidden-lg-up">
+      <a class="navbar-brand" href="{{ site.baseurl }}/">
+        Bootstrap
+      </a>
+      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
+    </div>
+
+    <div class="collapse navbar-collapse" id="bd-main-nav">
+      <ul class="nav navbar-nav">
+        <li class="nav-item active">
+          <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>
+        </li>
+        <li class="nav-item">
+          <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>
+        </li>
+        <li class="nav-item">
+          <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>
+        </li>
+        <li class="nav-item">
+          <a class="nav-item nav-link" href="{{ site.themes }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Themes');">Themes</a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-item nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-item nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a>
+        </li>
+      </ul>
+    </div>
+  </nav>
 </header>
-- 
cgit v1.2.3


From 9d13fd3fe3d1a4578dde8b2cf0a8c74b1e41405b Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Fri, 23 Dec 2016 13:31:09 -0800
Subject: remove old flex utils, update docs to match

---
 docs/_includes/nav-home.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html
index e325d8605..3ba8520e0 100644
--- a/docs/_includes/nav-home.html
+++ b/docs/_includes/nav-home.html
@@ -25,7 +25,7 @@
     </nav>
     {% endcomment %}
 
-    <div class="d-flex flex-items-between hidden-lg-up">
+    <div class="d-flex justify-content-between hidden-lg-up">
       <a class="navbar-brand" href="{{ site.baseurl }}/">
         Bootstrap
       </a>
-- 
cgit v1.2.3