From: Mark Otto <otto@github.com>
Date: Mon, 18 Feb 2013 02:58:40 +0000 (-0800)
Subject: Refactor some common classes from docs css and examples, then prevent examples from... 
X-Git-Tag: v3.0.0-rc1~643
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6f341bd17f24b1d744e1ec07f6974fd85d8825b;p=thirdparty%2Fbootstrap.git

Refactor some common classes from docs css and examples, then prevent examples from using docs.css
---

diff --git a/docs/_includes/colophon.html b/docs/_includes/colophon.html
index ae92db140c..5c15d7c787 100644
--- a/docs/_includes/colophon.html
+++ b/docs/_includes/colophon.html
@@ -1,6 +1,6 @@
 <!-- Footer
 ================================================== -->
-<footer class="footer">
+<footer class="bs-docs-footer">
   <div class="container">
 
     <div class="bs-docs-social">
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index fe23d008e6..a387930baf 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -14,9 +14,11 @@
 <!-- Bootstrap core CSS -->
 <link href="/assets/css/bootstrap.css" rel="stylesheet">
 
+{% if layout == "default" %}
 <!-- Documentation extras -->
 <link href="/assets/css/docs.css" rel="stylesheet">
 <link href="/assets/css/pygments-manni.css" rel="stylesheet">
+{% endif %}
 
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!--[if lt IE 9]>
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index a1ac79d3f7..e35badfc9b 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -15,7 +15,7 @@ body {
 
 /*  */
 .bs-docs-body > .container,
-.bs-docs-body .footer .container {
+.bs-docs-footer .container {
   padding-left:  15px;
   padding-right: 15px;
 }
@@ -106,23 +106,23 @@ section > ul li {
 /* Marketing section of Overview
 -------------------------------------------------- */
 
-.marketing {
+.bs-docs-marketing {
   text-align: center;
   color: #5a5a5a;
 }
-.marketing h1 {
+.bs-docs-marketing h1 {
   margin: 60px 0 10px;
   font-size: 50px;
   line-height: 1;
 }
-.marketing h2 {
+.bs-docs-marketing h2 {
   margin-bottom: 5px;
 }
-.marketing p {
+.bs-docs-marketing p {
   font-size: 16px;
   line-height: 1.4;
 }
-.marketing .marketing-byline {
+.bs-docs-marketing .marketing-byline {
   margin-bottom: 40px;
   font-size: 21px;
   font-weight: 300;
@@ -436,13 +436,13 @@ section > ul li {
 /* Footer
 -------------------------------------------------- */
 
-.footer {
+.bs-docs-footer {
   text-align: center;
   padding: 30px 0;
   margin-top: 100px;
   border-top: 1px solid #e5e5e5;
 }
-.footer p {
+.bs-docs-footer p {
   margin-bottom: 0;
   color: #777;
 }
diff --git a/docs/examples/jumbotron-narrow.html b/docs/examples/jumbotron-narrow.html
index b2c037a9e7..c39b5397b3 100644
--- a/docs/examples/jumbotron-narrow.html
+++ b/docs/examples/jumbotron-narrow.html
@@ -31,6 +31,13 @@ title: Narrow page template
     padding-bottom: 19px;
   }
 
+  /* Custom page footer */
+  .footer {
+    padding-top: 19px;
+    color: #777;
+    border-top: 1px solid #e5e5e5;
+  }
+
   /* Custom container */
   .container-narrow {
     margin: 0 auto;
@@ -119,8 +126,6 @@ title: Narrow page template
     </div>
   </div>
 
-  <hr>
-
   <div class="footer">
     <p>&copy; Company 2013</p>
   </div>