huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update t…

…o doces and stuff
twbs · Jan 27, 2012 · e8647c1 · e8647c1
1 parent 97546ad
commit e8647c1
Show file tree

Hide file tree

Showing 22 changed files with 351 additions and 269 deletions.
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
@@ -111,6 +111,8 @@
 @media (min-width: 768px) and (max-width: 940px) {
   .container {
     width: 748px;
+    padding-left: 10px;
+    padding-right: 10px;
   }
   .span1 {
     width: 44px;

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Fri Jan 27 12:16:22 EST 2012
+ * Date: Fri Jan 27 13:19:35 PST 2012
  */
 article,
 aside,
@@ -1791,11 +1791,12 @@ table .span12 {
   line-height: 1;
   color: #ffffff;
 }
-.navbar p {
-  margin: 0;
+.navbar .navbar-text {
+  margin-bottom: 0;
   line-height: 40px;
+  color: #999999;
 }
-.navbar p a:hover {
+.navbar .navbar-text a:hover {
   color: #ffffff;
   background-color: transparent;
 }
@@ -1841,7 +1842,7 @@ table .span12 {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query::-webkit-input-placeholder {
+.navbar-search .search-query ::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
@@ -1870,7 +1871,7 @@ table .span12 {
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-.navbar-fixed {
+.navbar-fixed-top {
   position: fixed;
   top: 0;
   right: 0;
@@ -1916,7 +1917,7 @@ table .span12 {
   margin: 0 5px;
   overflow: hidden;
   background-color: #222222;
-  border-right: 1px solid #444;
+  border-right: 1px solid #333333;
 }
 .navbar .nav.pull-right {
   margin-left: 10px;
@@ -2649,7 +2650,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   margin-bottom: 18px;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
   background-color: #fcf8e3;
-  border: 1px solid #f3edd2;
+  border: 1px solid #fbeed5;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
@@ -2664,14 +2665,14 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 }
 .alert-success {
   background-color: #dff0d8;
-  border-color: #cfe8c4;
+  border-color: #d6e9c6;
 }
 .alert-success, .alert-success .alert-heading {
   color: #468847;
 }
 .alert-danger, .alert-error {
   background-color: #f2dede;
-  border-color: #e9c7c7;
+  border-color: #eed3d7;
 }
 .alert-danger,
 .alert-error,
@@ -2681,7 +2682,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 }
 .alert-info {
   background-color: #d9edf7;
-  border-color: #bfe1f2;
+  border-color: #bce8f1;
 }
 .alert-info, .alert-info .alert-heading {
   color: #3a87ad;

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
@@ -20,7 +20,7 @@ body {
 
 /* Tweak navbar brand link to be super sleek
 -------------------------------------------------- */
-.navbar-fixed .brand {
+.navbar-fixed-top .brand {
   padding-right: 0;
   padding-left: 0;
   margin-left: 20px;
@@ -32,7 +32,7 @@ body {
      -moz-transition: all .2s linear;
           transition: all .2s linear;
 }
-.navbar-fixed .brand:hover {
+.navbar-fixed-top .brand:hover {
   text-decoration: none;
 }
 
@@ -302,14 +302,9 @@ hr.soften {
 
 /* Quickstart section for getting le code
 -------------------------------------------------- */
-.getting-started h3,
-.getting-started p {
-  line-height: 18px;
-  text-align: center;
-  margin-bottom: 9px;
-}
 .getting-started p {
   color: #777;
+  margin-bottom: 9px;
 }
 .getting-started .current-version,
 .getting-started .current-version a {
@@ -322,14 +317,12 @@ hr.soften {
   display: block;
   width: 95%;
   height: auto;
-  margin-left: auto;
-  margin-right: auto;
   font-family: Menlo, Monaco, "Courier New", monospace;
   font-size: 12px;
   line-height: 20px;
   white-space: nowrap;
   overflow: hidden;
-  background-color: #f5f5f5;
+  color: #999;
   /* Makes inputs behave like true block-level elements */
   -webkit-box-sizing: border-box; /* Older Webkit */
      -moz-box-sizing: border-box; /* Older FF */
@@ -339,6 +332,9 @@ hr.soften {
   *width: 80%;
   *height: 24px;
 }
+.getting-started textarea:focus {
+  color: #333;
+}
 
 
 /* Footer
@@ -476,7 +472,7 @@ hr.soften {
   margin-top: 36px;
 }
 .page-header .toggle-all {
-  margin-top: 13px;
+  margin-top: 5px;
 }
 
 /* Space out h3s when following a section */
@@ -518,20 +514,28 @@ hr.soften {
   color: #777;
 }
 
+/* Variables section */
+#variables label {
+  margin-bottom: 0;
+}
+
 /* Giant download button */
 .download-btn {
   margin: 36px 0 108px.i;
 }
 .download p,
 .download h4 {
   max-width: 50%;
-  margin: 0 auto 18px;
+  margin: 0 auto;
   color: #999;
   text-align: center;
 }
-.download-btn h4 {
+.download h4 {
   margin-bottom: 0;
 }
+.download p {
+  margin-bottom: 18px;
+}
 .btn.xlarge {
   display: block;
   width: auto;

diff --git a/docs/base-css.html b/docs/base-css.html
@@ -30,7 +30,7 @@
 
   <!-- Navbar
     ================================================== -->
-    <div class="navbar navbar-fixed">
+    <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./index.html">Bootstrap</a>

diff --git a/docs/components.html b/docs/components.html
@@ -30,7 +30,7 @@
 
   <!-- Navbar
     ================================================== -->
-    <div class="navbar navbar-fixed">
+    <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./index.html">Bootstrap</a>
@@ -71,7 +71,7 @@ <h1>Components</h1>
   <div class="subnav">
     <ul class="nav pills">
       <li><a href="#buttonGroups">Button groups</a></li>
-      <li><a href="#comboButtons">Combo buttons</a></li>
+      <li><a href="#buttonDropdowns">Button dropdowns</a></li>
       <li><a href="#navs">Nav, tabs, pills</a></li>
       <li><a href="#navbar">Navbar</a></li>
       <li><a href="#breadcrumbs">Breadcrumbs</a></li>
@@ -157,9 +157,9 @@ <h4 class="muted">Heads up</h4>
 
 <!-- Split button dropdowns
 ================================================== -->
-<section id="comboButtons">
+<section id="buttonDropdowns">
   <div class="page-header">
-    <h1>Combo buttons <small>Built on button groups to provide contextual dropdown menus</small></h1>
+    <h1>Buttons dropdowns <small>Built on button groups to provide contextual dropdown menus</small></h1>
   </div>
   <div class="row">
     <div class="span4">
@@ -699,9 +699,9 @@ <h3>Navbar scaffolding</h3>
   &lt;/div&gt;
 &lt;/div&gt;
 </pre>
-      <p>To make the navbar fixed, swap the <code>.navbar-static</code> class for <code>.navbar-fixed</code>. In your CSS, you will also need to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code>&lt;body&gt;</code>.</p>
+      <p>To make the navbar fixed, swap the <code>.navbar-static</code> class for <code>.navbar-fixed-top</code>. In your CSS, you will also need to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code>&lt;body&gt;</code>.</p>
 <pre class="prettyprint linenums">
-&lt;div class="navbar navbar-fixed"&gt;
+&lt;div class="navbar navbar-fixed-top"&gt;
   ...
 &lt;/div&gt;
 </pre>