From: Mark Otto <otto@github.com>
Date: Fri, 16 Aug 2013 19:43:54 +0000 (-0700)
Subject: docs cleanup on naming to fix #9710
X-Git-Tag: v3.0.0~78^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=551c561ee2471681c5c7536c2cfe81d15f180cf7;p=thirdparty%2Fbootstrap.git

docs cleanup on naming to fix #9710
---

diff --git a/_includes/nav-components.html b/_includes/nav-components.html
index dcb4374ef4..c60a1cd450 100644
--- a/_includes/nav-components.html
+++ b/_includes/nav-components.html
@@ -73,13 +73,8 @@
 </li>
 <li><a href="#labels">Labels</a></li>
 <li><a href="#badges">Badges</a></li>
-<li>
-  <a href="#type-components">Typography</a>
-  <ul class="nav">
-    <li><a href="#type-components-jumbotron">Jumbotron</a></li>
-    <li><a href="#type-components-page-header">Page header</a></li>
-  </ul>
-</li>
+<li><a href="#jumbotron">Jumbotron</a></li>
+<li><a href="#page-header">Page header</a></li>
 <li>
   <a href="#thumbnails">Thumbnails</a>
   <ul class="nav">
diff --git a/assets/css/docs.css b/assets/css/docs.css
index f3e3b13bb0..1a2c367f6d 100644
--- a/assets/css/docs.css
+++ b/assets/css/docs.css
@@ -418,7 +418,7 @@ body {
 .bs-example > blockquote:last-child,
 .bs-example > .form-control:last-child,
 .bs-example > .table:last-child,
-.bs-example > .navbar:last-child
+.bs-example > .navbar:last-child,
 .bs-example > .jumbotron:last-child,
 .bs-example > .alert:last-child,
 .bs-example > .panel:last-child,
diff --git a/components.html b/components.html
index ead8cf1418..a5bdb7c327 100644
--- a/components.html
+++ b/components.html
@@ -11,7 +11,7 @@ base_url: "../"
   ================================================== -->
   <div class="bs-docs-section">
     <div class="page-header">
-      <h1 id="dropdowns">Dropdown menus</h1>
+      <h1 id="dropdowns">Dropdowns</h1>
     </div>
     <p class="lead">Toggleable, contextual menu for displaying lists of links. Made interactive with the <a href="../javascript/#dropdowns">dropdown JavaScript plugin</a>.</p>
 
@@ -318,7 +318,7 @@ base_url: "../"
   ================================================== -->
   <div class="bs-docs-section">
     <div class="page-header">
-      <h1 id="btn-dropdowns">Button dropdown menus</h1>
+      <h1 id="btn-dropdowns">Button dropdowns</h1>
     </div>
     <p class="lead">Use any button to trigger a dropdown menu by placing it within a <code>.btn-group</code> and providing the proper menu markup.</p>
 
@@ -1767,14 +1767,12 @@ body { padding-bottom: 70px; }
 
 
 
-  <!-- Typographic components
+  <!-- Jumbotron
   ================================================== -->
   <div class="bs-docs-section">
     <div class="page-header">
-      <h1 id="type-components">Typographic components</h1>
+      <h1 id="jumbotron">Jumbotron</h1>
     </div>
-
-    <h2 id="type-components-jumbotron">Jumbotron</h2>
     <p>A lightweight, flexible component to showcase key content on your site. It works well on marketing and content-heavy sites.</p>
     <div class="bs-example">
       <div class="jumbotron">
@@ -1790,8 +1788,16 @@ body { padding-bottom: 70px; }
   <p><a class="btn btn-primary btn-lg">Learn more</a></p>
 </div>
 {% endhighlight %}
+  </div>
+
+
 
-    <h2 id="type-components-page-header">Page header</h2>
+  <!-- Page header
+  ================================================== -->
+  <div class="bs-docs-section">
+    <div class="page-header">
+      <h1 id="page-header">Page header</h1>
+    </div>
     <p>A simple shell for an <code>h1</code> to appropriately space out and segment sections of content on a page. It can utilize the <code>h1</code>'s default <code>small</code> element, as well as most other components (with additional styles).</p>
     <div class="bs-example">
       <div class="page-header">