redo all the things

diff --git a/docs/_includes/colophon.html b/docs/_includes/colophon.html
index 5c15d7c7874a9b962ee8eb1e941fea3a844ba92a..2cae5ef56069cd6903b3850821e76dc25a498934 100644 (file)
--- a/docs/_includes/colophon.html
+++ b/docs/_includes/colophon.html
@@ -1,7 +1,7 @@
 <!-- Footer
 ================================================== -->
 <footer class="bs-docs-footer">
-  <div class="container">
+  <div class="bs-docs-container">
 
     <div class="bs-docs-social">
       <ul class="bs-docs-social-buttons">

diff --git a/docs/_layouts/home.html b/docs/_layouts/home.html
index e837f951736187e9ff956acee52a38f15f3138e6..184936f38fc198886b73f7aa3f328f36cb04b621 100644 (file)
--- a/docs/_layouts/home.html
+++ b/docs/_layouts/home.html
@@ -10,9 +10,6 @@
     <!-- Page content of course! -->
     {{ content }}
 
-    <!-- Main docs footer (social buttons, copyright, etc). -->
-    {% include colophon.html %}
-
     <!-- JS and analytics only. -->
     {% include footer.html %}
 

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 2ec7799edf09579dccc74ef8fb32c3fffb8cab03..b2fb42c171d3fc8d69269f48a8f2e59c55a22ce1 100644 (file)
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -26,12 +26,6 @@ body {
   margin-right: -15px;
 }
 
-/*  */
-.bs-docs-footer {
-  padding-left:  15px;
-  padding-right: 15px;
-}
-
 /* Side notes for calling out things */
 .bs-docs-sidenote {
   margin: 20px 0;
@@ -81,24 +75,10 @@ section > ul li {
   position: relative;
   margin-bottom: 20px;
   padding: 30px 15px;
-  color: #fff;
-  text-align: center;
-  background-color: #b94a48;
 }
 .bs-docs-jumbotron h1 {
   font-size: 50px;
-}
-
-/* Link styles (used on .masthead-links as well) */
-.bs-docs-jumbotron a {
-  color: #fff;
-  color: rgba(255,255,255,.5);
-  -webkit-transition: all .2s ease-in-out;
-     -moz-transition: all .2s ease-in-out;
-          transition: all .2s ease-in-out;
-}
-.bs-docs-jumbotron a:hover {
-  color: #fff;
+  line-height: 1;
 }
 
 /* Download button */
@@ -109,19 +89,13 @@ section > ul li {
   font-size: 21px;
   color: #b94a48; /* redeclare to override the `.jumbotron a` */
   background-color: #fff;
+  border-color: #e5e5e5;
 }
-.bs-docs-jumbotron .btn,
 .bs-docs-jumbotron .btn:hover,
 .bs-docs-jumbotron .btn:active {
-  color: #b94a48; /* redeclare to override the `.jumbotron a` */
-  background-color: #fff;
-  border-color: #fff;
-}
-
-/* Masthead (docs home)
-------------------------- */
-.masthead h1 {
-  line-height: 1;
+  color: #fff; /* redeclare to override the `.jumbotron a` */
+  background-color: #b94a48;
+  border-color: #b94a48;
 }
 
 /* Textual links in masthead */
@@ -131,42 +105,10 @@ section > ul li {
 }
 .masthead-links li {
   display: inline;
-  padding: 0 10px;
-  color: rgba(255,255,255,.25);
-}
-
-
-
-/* Marketing section of Overview
--------------------------------------------------- */
-
-.bs-docs-marketing {
-  text-align: center;
-  color: #5a5a5a;
-}
-.bs-docs-marketing h1 {
-  margin: 60px 0 10px;
-  font-size: 50px;
-  line-height: 1;
-}
-.bs-docs-marketing h2 {
-  margin-bottom: 5px;
-}
-.bs-docs-marketing p {
-  font-size: 16px;
-  line-height: 1.4;
-}
-.bs-docs-marketing .marketing-byline {
-  margin-bottom: 40px;
-  font-size: 21px;
-  font-weight: 300;
-  line-height: 1.25;
   color: #999;
 }
-.marketing-img {
-  display: block;
-  margin: 30px auto 10px;
-  max-height: 145px;
+.masthead-links li + li {
+  margin-left: 20px;
 }
 
 
@@ -309,9 +251,6 @@ section > ul li {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
 }
-.prettyprint .linenums {
-  /*margin-left: 0;*/
-}
 
 /* Tweak content of examples for optimum awesome */
 .bs-docs-example > p:last-child,
@@ -585,7 +524,6 @@ section > ul li {
 -------------------------------------------------- */
 
 .bs-docs-footer {
-  text-align: center;
   padding-top: 30px;
   padding-bottom: 30px;
   margin-top: 100px;
@@ -608,22 +546,23 @@ section > ul li {
 
 /* Social proof buttons from GitHub & Twitter */
 .bs-docs-social {
-  margin-top: 10px;
+  margin-top: 40px;
   margin-bottom: 20px;
-  text-align: center;
+  border-top: 1px solid #e5e5e5;
 }
 /* Quick links on Home */
 .bs-docs-social-buttons {
   display: inline-block;
   margin: 0;
-  padding: 0 10px;
   list-style: none;
 }
 .bs-docs-social-buttons li {
   display: inline-block;
-  padding: 5px 8px;
   line-height: 1;
 }
+.bs-docs-social-buttons li + li {
+  margin-left: 15px;
+}
 .bs-docs-social-buttons .twitter-follow-button {
   width: 225px !important;
 }
@@ -739,8 +678,7 @@ input.focused {
   }
 
   /* Undo custom padding */
-  .bs-docs-container,
-  .bs-home-container {
+  .bs-docs-container {
     padding-left: 0;
     padding-right: 0;
   }
@@ -759,9 +697,8 @@ input.focused {
     font-size: 100px;
   }
   .masthead p {
+    max-width: 70%;
     font-size: 30px;
-    margin-left: 10%;
-    margin-right: 10%;
   }
   .subhead {
     padding-top:    60px;

diff --git a/docs/index.html b/docs/index.html
index b2e6aa4329d90242f11b0f4075eead75a48862df..0349069fb2f19ff6e9eb03df9fe4aad78e60f2ea 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -5,12 +5,31 @@ title: Bootstrap
 
 <div class="bs-docs-jumbotron masthead">
   <div class="container">
+
     <h1>Bootstrap</h1>
     <p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
     <p>
       <a href="assets/bootstrap.zip" class="btn btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0']);">Download Bootstrap</a>
       <a href="./docs/" class="btn btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Docs', 'View docs']);">View docs</a>
     </p>
+
+    <div class="bs-docs-social">
+      <ul class="bs-docs-social-buttons">
+        <li>
+          <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+        </li>
+        <li>
+          <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102px" height="20px"></iframe>
+        </li>
+        <li class="follow-btn">
+          <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a>
+        </li>
+        <li class="tweet-btn">
+          <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twitter.github.com/bootstrap/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a>
+        </li>
+      </ul>
+    </div>
+
     <ul class="masthead-links">
       <li>
         <a href="http://github.com/twitter/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
@@ -18,12 +37,17 @@ title: Bootstrap
       <li>
         <a href="./docs/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
       </li>
+      <li>
+        <a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>
+      </li>
       <li>Version 3.0.0</li>
     </ul>
+
   </div>
 </div>
 
-<div class="container bs-home-container">
+
+<!-- <div class="container bs-home-container">
 
   <div class="bs-docs-marketing">
 
@@ -76,3 +100,4 @@ title: Bootstrap
   </div>
 
 </div>
+ -->
\ No newline at end of file