Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

_layouts/default.html

@@ -48,13 +48,13 @@
         </div>
       </div>
 
-      <!-- Quick back to top -->
-      <a href="#" class="bs-top">
-        Back to top
-      </a>
-
     </div>
 
+    <!-- Quick back to top -->
+    <a href="#" class="bs-top">
+      Back to top
+    </a>
+
     <!-- Footer
     ================================================== -->
     <footer class="bs-footer">

assets/css/docs.css

@@ -15,15 +15,15 @@ body {
 
 /* Custom docs button */
 .btn-bs {
-  color: #b94a48;
+  color: #563d7c;
   background-color: #fff;
   border-color: #e5e5e5;
 }
 .btn-bs:hover,
 .btn-bs:active {
   color: #fff;
-  background-color: #b94a48;
+  background-color: #563d7c;
-  border-color: #b94a48;
+  border-color: #563d7c;
 }
 
 /* Temp CSS until RC2 */
@@ -39,13 +39,13 @@ body {
 -------------------------------------------------- */
 
 .bs-docs-nav {
-  background-color: #b94a48;
+  background-color: #563d7c;
 }
 .bs-docs-nav .navbar-brand {
   color: #fff;
 }
 .bs-docs-nav .navbar-nav > li > a {
-  color: #e6cac8;
+  color: #cdbfe3;
 }
 .bs-docs-nav .navbar-nav > li > a:hover {
   color: #fff;
@@ -53,14 +53,14 @@ body {
 .bs-docs-nav .navbar-nav > .active > a,
 .bs-docs-nav .navbar-nav > .active > a:hover {
   color: #fff;
-  background-color: #993c3a;
+  background-color: #463265;
 }
 .bs-docs-nav .navbar-toggle {
-  border-color: #b94a48;
+  border-color: #563d7c;
 }
 .bs-docs-nav .navbar-toggle:hover {
-  background-color: #993c3a;
+  background-color: #463265;
-  border-color: #993c3a;
+  border-color: #463265;
 }
 
 /* Old docs callout */
@@ -152,7 +152,7 @@ body {
   border-bottom: 1px solid #e5e5e5;
 }
 .bs-header h1 {
-  color: #b94a48;
+  color: #563d7c;
 }
 .bs-header p {
   font-weight: 300;
@@ -239,9 +239,9 @@ body {
 .bs-sidebar .nav > .active:hover > a,
 .bs-sidebar .nav > .active:focus > a {
   font-weight: 500;
-  color: #b94a48;
+  color: #563d7c;
   background-color: transparent;
-  border-right: 1px solid #b94a48;
+  border-right: 1px solid #563d7c;
 }
 
 /* Nav: second level (shown on .active) */
@@ -308,9 +308,8 @@ body {
   padding-bottom: 10px;
   background-color: #eee;
   border: 1px solid #ddd;
-  /* Todo: reconcile these */
+  background-color: rgba(86,61,124,.15);
-  background-color: rgba(185,74,72,.15);
+  border: 1px solid rgba(86,61,124,.2);
-  border: 1px solid rgba(185,74,72,.2);
 }
 
 

assets/js/application.js

@@ -9,7 +9,7 @@
     var $window = $(window)
 
     // Disable certain links in docs
-    $('[href=#]').click(function (e) {
+    $('.bs-docs-container [href=#]').click(function (e) {
       e.preventDefault()
     })
 

css.html

@@ -539,15 +539,19 @@ lead: "Global CSS settings, fundamental HTML elements styled and enhanced with e
     <p>Convey meaning through color with a handful of emphasis utility classes.</p>
     <div class="bs-example">
       <p class="text-muted">Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.</p>
+      <p class="text-primary">Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
       <p class="text-warning">Etiam porta sem malesuada magna mollis euismod.</p>
       <p class="text-danger">Donec ullamcorper nulla non metus auctor fringilla.</p>
       <p class="text-success">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</p>
+      <p class="text-info">Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
     </div>
 {% highlight html %}
 <p class="text-muted">...</p>
+<p class="text-primary">...</p>
 <p class="text-warning">...</p>
 <p class="text-danger">...</p>
 <p class="text-success">...</p>
+<p class="text-info">...</p>
 {% endhighlight %}
 
 

dist/css/bootstrap.css

@@ -379,36 +379,24 @@ cite {
   color: #999999;
 }
 
-a.text-muted:hover,
+.text-primary {
-a.text-muted:focus {
+  color: #428bca;
-  color: #808080;
 }
 
 .text-warning {
   color: #c09853;
 }
 
-a.text-warning:hover,
-a.text-warning:focus {
-  color: #a47e3c;
-}
-
 .text-danger {
   color: #b94a48;
 }
 
-a.text-danger:hover,
-a.text-danger:focus {
-  color: #953b39;
-}
-
 .text-success {
   color: #468847;
 }
 
-a.text-success:hover,
+.text-info {
-a.text-success:focus {
+  color: #3a87ad;
-  color: #356635;
 }
 
 .text-left {

less/type.less

@@ -23,25 +23,18 @@ p {
 // Ex: 14px base font * 85% = about 12px
 small   { font-size: 85%; }
 
+// Undo browser default styling
 cite    { font-style: normal; }
 
-// Utility classes
+// Contextual emphasis
 .text-muted          { color: @gray-light; }
-a.text-muted:hover,
+.text-primary        { color: @brand-primary; }
-a.text-muted:focus   { color: darken(@gray-light, 10%); }
-
 .text-warning        { color: @state-warning-text; }
-a.text-warning:hover,
-a.text-warning:focus { color: darken(@state-warning-text, 10%); }
-
 .text-danger         { color: @state-danger-text; }
-a.text-danger:hover,
-a.text-danger:focus  { color: darken(@state-danger-text, 10%); }
-
 .text-success        { color: @state-success-text; }
-a.text-success:hover,
+.text-info           { color: @state-info-text; }
-a.text-success:focus { color: darken(@state-success-text, 10%); }
 
+// Alignment
 .text-left           { text-align: left; }
 .text-right          { text-align: right; }
 .text-center         { text-align: center; }