Docs cleanup for v3 prep

diff --git a/_includes/nav-main.html b/_includes/nav-main.html
index 197bad2d83335e7ab901ce3e6940a4e0c1406d03..c880c32939ae710315f3cb9b40ac0e6deb1be0c0 100644 (file)
--- a/_includes/nav-main.html
+++ b/_includes/nav-main.html
@@ -7,7 +7,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a href="{{ page.base_url }}" class="navbar-brand">Bootstrap 3 RC2</a>
+      <a href="{{ page.base_url }}" class="navbar-brand">Bootstrap</a>
     </div>
     <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
       <ul class="nav navbar-nav">

diff --git a/_layouts/default.html b/_layouts/default.html
index c2ff9f808475bb603c4d7cb8d1248ded4d160558..a7429c461cecd13028f1e11684bdc183f62f9c08 100644 (file)
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -57,6 +57,8 @@
       <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
       <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
       <ul class="footer-links">
+        <li><a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a></li>
+        <li class="muted">&middot;</li>
         <li><a href="{{ site.blog }}">Blog</a></li>
         <li class="muted">&middot;</li>
         <li><a href="{{ site.repo }}/issues?state=open">Issues</a></li>

diff --git a/_layouts/home.html b/_layouts/home.html
index b51eea24389f984e1340cd07d01ba1ce6d33459e..a882f3ae3a2b7688dff26c1c14df18477696bfd4 100644 (file)
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -14,13 +14,11 @@
     <!-- Page content of course! -->
     {{ content }}
 
-    <!-- Callout for the old docs link -->
-    {% include old-bs-docs.html %}
-
     <footer class="container" role="contentinfo">
       {% include social-buttons.html %}
 
       <ul class="bs-masthead-links">
+        <li><a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a></li>
         <li>
           <a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
         </li>

diff --git a/assets/css/docs.css b/assets/css/docs.css
index 4c3afd84fde7a0b34b3dbe742f59ef789cfad9d3..f395682c54abdb1c1dda122c64e2bcf45146d37b 100644 (file)
--- a/assets/css/docs.css
+++ b/assets/css/docs.css
@@ -41,14 +41,6 @@ body {
   border-color: #fff;
 }
 
-/* Temp CSS until RC2 */
-.bs-customize-placeholder {
-  margin-bottom: -100px;
-  padding: 80px 30px;
-  text-align: center;
-  background-color: #f5f5f5;
-}
-
 
 /* Top nav and header
 -------------------------------------------------- */
@@ -56,6 +48,7 @@ body {
 .bs-docs-nav {
   background-color: #563d7c;
   border-color: #463265;
+  box-shadow: 0 1px 0 rgba(255,255,255,.1);
 }
 .bs-docs-nav .navbar-collapse {
   border-color: #463265;
@@ -87,6 +80,7 @@ body {
   padding: 15px 20px;
   color: #777;
   background-color: #fafafa;
+  border-top: 1px solid #fff;
   border-bottom: 1px solid #e5e5e5;
 }
 .bs-old-docs strong {
@@ -95,7 +89,6 @@ body {
 .bs-docs-home .bs-old-docs {
   padding-top: 0;
   padding-bottom: 0;
-  text-align: center;
   color: inherit;
   background-color: transparent;
   border-color: transparent;
@@ -105,13 +98,14 @@ body {
 }
 
 /* Homepage */
-.bs-docs-home {
+.bs-docs-home,
+.bs-header {
   color: #cdbfe3;
   background-color: #563d7c;
   background-image: url("../img/map.png");
 }
 .bs-docs-home .navbar {
-  background-color: transparent;
+  /*background-color: transparent;*/
 }
 
 
@@ -140,14 +134,12 @@ body {
 /* Textual links */
 .bs-social {
   margin-top: 30px;
-  text-align: center;
 }
 .bs-masthead-links {
   margin-top: 20px;
   margin-bottom: 20px;
   padding-left: 0;
   list-style: none;
-  text-align: center;
 }
 .bs-masthead-links li {
   display: inline;
@@ -206,12 +198,10 @@ body {
 .bs-header {
   padding: 30px 30px 40px;
   font-size: 16px;
-  color: #5a5a5a;
   text-align: center;
-  border-bottom: 1px solid #e5e5e5;
 }
 .bs-header h1 {
-  color: #563d7c;
+  color: #fff;
 }
 .bs-header p {
   font-weight: 300;
@@ -235,9 +225,9 @@ body {
   font-size: 13px !important;
   line-height: 16px !important;
   text-align: left;
-  background: none !important;
+  background: #463265 !important;
   border: 0 !important;
-  border-top: 1px solid #e5e5e5 !important;
+  border-top: 1px solid #463265 !important;
 }
 .carbonad-img {
   margin: 0 !important;
@@ -255,8 +245,13 @@ body {
   padding-top: 0 !important;
 }
 .carbonad-tag {
+  color: #cdbfe3 !important;
   text-align: left !important;
 }
+.carbonad-text a,
+.carbonad-tag a {
+  color: #fff !important;
+}
 .carbonad #azcarbon > img {
   display: none; /* hide what I assume are tracking images */
 }
@@ -500,6 +495,10 @@ body {
   padding: 0;
   overflow: hidden; /* cut the drop shadows off */
 }
+.bs-navbar-top-example .navbar-header,
+.bs-navbar-bottom-example .navbar-header {
+  margin-left: 0;
+}
 .bs-navbar-top-example .navbar-fixed-top,
 .bs-navbar-bottom-example .navbar-fixed-bottom {
   position: relative;
@@ -705,7 +704,6 @@ body {
   padding-top: 40px;
   padding-bottom: 30px;
   margin-top: 100px;
-  text-align: center;
   border-top: 1px solid #e5e5e5;
 }
 .bs-footer p {
@@ -853,8 +851,9 @@ body {
 
   .carbonad {
     margin: 0 !important;
-    border: 1px solid #e5e5e5 !important;
+    border: 1px solid #463265 !important;
     border-radius: 4px;
+    box-shadow: 0 1px 0 rgba(255,255,255,.1);
   }
 
   /* Show the docs nav */
@@ -864,6 +863,7 @@ body {
 
   /* Tweak display of docs jumbotrons */
   .bs-masthead {
+    text-align: left;
     padding-top:    140px;
     padding-bottom: 140px;
   }
@@ -871,8 +871,7 @@ body {
     font-size: 100px;
   }
   .bs-masthead .lead {
-    margin-left: 15%;
-    margin-right: 15%;
+    margin-right: 25%;
     font-size: 30px;
   }
 

diff --git a/getting-started.html b/getting-started.html
index 016ef4c3e7aa5144fa4a77aff66c701a9be7b45b..d5f1aab31a26822cce099b79773dce0ed60c54b4 100644 (file)
--- a/getting-started.html
+++ b/getting-started.html
@@ -15,14 +15,9 @@ base_url: "../"
     </div>
     <p class="lead">There are a few easy ways to quickly get started with Bootstrap, each one appealing to a different skill level and use case. Read through to see what suits your particular needs.</p>
 
-    <h3>Download latest full source</h3>
-    <p>Until Bootstrap 3.0.0 is finalized, download the latest full source code (includes compiled and minified versions of our CSS and JavaScript under the <code>dist/</code> directory).</p>
-    <p><a class="btn btn-lg btn-primary" href="{{ site.download }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download latest Bootstrap 3</a></p>
-    <!--
     <h3>Download compiled CSS and JS</h3>
     <p class="lead">The fastest way to get started is to get the compiled and minified versions of our CSS and JavaScript. No documentation or original source files are included.</p>
     <p><a class="btn btn-lg btn-primary" href="{{ site.download_dist }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a></p>
-    -->
 
     <h3 id="download-options">More download options</h3>
     <div class="bs-docs-dl-options">

diff --git a/index.html b/index.html
index 4582d8586b9753a572c8086716f2f4a18afd1cc2..c5c3cf5a4d9b60c9676d504bce9c9d2dc140a234 100644 (file)
--- a/index.html
+++ b/index.html
@@ -9,8 +9,7 @@ base_url: "./"
     <h1>Bootstrap 3</h1>
     <p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
     <p>
-      <a href="{{ site.download }}" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0 RC2']);">Download latest BS3</a>
+      <a href="{{ site.download }}" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0']);">Download Bootstrap</a>
     </p>
-    <p><strong>Heads up!</strong> Downloads are pulled directly from the latest committed code on GitHub, and as a result our docs may at times be out of sync.</p>
   </div>
 </main>