Merge branch 'docs_welcome'

3 files changed, 26 insertions, 0 deletions

diff --git a/_includes/nav-about.html b/_includes/nav-about.html
new file mode 100644
index 000000000..2cf12359b
--- /dev/null
+++ b/_includes/nav-about.html
@@ -0,0 +1,12 @@
+<li>
+  <a href="#history">History</a>
+</li>
+<li>
+  <a href="#team">Core team</a>
+</li>
+<li>
+  <a href="#community">Community</a>
+</li>
+<li>
+  <a href="#translations">Translations</a>
+</li>
diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html
index 243c05fb0..c06896e6a 100644
--- a/_includes/nav-getting-started.html
+++ b/_includes/nav-getting-started.html
@@ -1,4 +1,13 @@
 <li>
+  <a href="#welcome">Welcome</a>
+  <ul class="nav">
+    <li><a href="#welcome-history">Brief history</a></li>
+    <li><a href="#welcome-core-team">Core team</a></li>
+    <li><a href="#welcome-callouts">Callouts</a></li>
+    <li><a href="#welcome-community">Community</a></li>
+  </ul>
+</li>
+<li>
   <a href="#download">Download Bootstrap</a>
   <ul class="nav">
     <li><a href="#download-compiled">Compiled CSS, JS, and fonts</a></li>
diff --git a/_includes/nav-main.html b/_includes/nav-main.html
index c880c3293..a64b7c8ae 100644
--- a/_includes/nav-main.html
+++ b/_includes/nav-main.html
@@ -27,6 +27,11 @@
           <a href="{{ page.base_url }}customize">Customize</a>
         </li>
       </ul>
+      <ul class="nav navbar-nav navbar-right">
+        <li{% if page.slug == "about" %} class="active"{% endif %}>
+          <a href="{{ page.base_url }}about">About</a>
+        </li>
+      </ul>
     </nav>
   </div>
 </header>