Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into…

… features/warning_progress_bar
twbs · Feb 28, 2012 · a397130 · a397130
2 parents 15759d9 + fbebb04
commit a397130
Show file tree

Hide file tree

Showing 46 changed files with 1,967 additions and 676 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,17 @@
-TWITTER BOOTSTRAP
+[Twitter Bootstrap](http://twitter.github.com/bootstrap)
 =================
 
-Bootstrap is Twitter's toolkit for kickstarting CSS for websites, apps, and more. It includes base CSS styles for typography, forms, buttons, tables, grids, navigation, alerts, and more.
+Bootstrap provides simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions. In other words, it's a front-end toolkit for faster, more beautiful web development. It's created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter.
+
+To get started, checkout http://twitter.github.com/bootstrap!
+
+
+
+Quick start
+-----------
+
+Clone the repo, `git clone git@github.com:twitter/bootstrap.git`, or [download the latest release](https://github.com/twitter/bootstrap/zipball/master).
 
-To get started -- checkout http://twitter.github.com/bootstrap!
 
 
 Versioning
@@ -24,6 +32,7 @@ And constructed with the following guidelines:
 For more information on SemVer, please visit http://semver.org/.
 
 
+
 Bug tracker
 -----------
 
@@ -32,10 +41,12 @@ Have a bug? Please create an issue here on GitHub!
 https://github.com/twitter/bootstrap/issues
 
 
+
 Twitter account
 ---------------
 
-Keep up to date on announcements and more by following Bootstrap on Twitter, <a href="http://twitter.com/TwBootstrap">@TwBootstrap</a>.
+Keep up to date on announcements and more by following Bootstrap on Twitter, [@TwBootstrap](http://twitter.com/TwBootstrap).
+
 
 
 Mailing list
@@ -48,6 +59,7 @@ twitter-bootstrap@googlegroups.com
 http://groups.google.com/group/twitter-bootstrap
 
 
+
 IRC
 ---
 
@@ -56,6 +68,7 @@ Server: irc.freenode.net
 Channel: ##twitter-bootstrap (the double ## is not a typo)
 
 
+
 Developers
 ----------
 
@@ -68,6 +81,7 @@ Runs the LESS compiler to rebuild the `/less` files and compiles the docs pages.
 This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.
 
 
+
 Authors
 -------
 
@@ -82,6 +96,7 @@ Authors
 + http://github.com/fat
 
 
+
 Copyright and license
 ---------------------
 

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
@@ -21,6 +21,52 @@
   display: none;
   visibility: hidden;
 }
+.visible-phone {
+  display: none;
+}
+.visible-tablet {
+  display: none;
+}
+.visible-desktop {
+  display: block;
+}
+.hidden-phone {
+  display: block;
+}
+.hidden-tablet {
+  display: block;
+}
+.hidden-desktop {
+  display: none;
+}
+@media (max-width: 767px) {
+  .visible-phone {
+    display: block;
+  }
+  .hidden-phone {
+    display: none;
+  }
+  .hidden-desktop {
+    display: block;
+  }
+  .visible-desktop {
+    display: none;
+  }
+}
+@media (min-width: 768px) and (max-width: 979px) {
+  .visible-tablet {
+    display: block;
+  }
+  .hidden-tablet {
+    display: none;
+  }
+  .hidden-desktop {
+    display: block;
+  }
+  .visible-desktop {
+    display: none;
+  }
+}
 @media (max-width: 480px) {
   .nav-collapse {
     -webkit-transform: translate3d(0, 0, 0);
@@ -128,6 +174,9 @@
     float: left;
     margin-left: 20px;
   }
+  .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
+    width: 724px;
+  }
   .span1 {
     width: 42px;
   }
@@ -161,7 +210,7 @@
   .span11 {
     width: 662px;
   }
-  .span12, .container {
+  .span12 {
     width: 724px;
   }
   .offset1 {
@@ -197,6 +246,9 @@
   .offset11 {
     margin-left: 702px;
   }
+  .offset12 {
+    margin-left: 764px;
+  }
   .row-fluid {
     width: 100%;
     *zoom: 1;
@@ -251,40 +303,43 @@
   .row-fluid > .span12 {
     width: 99.999999993%;
   }
-  input.span1, textarea.span1, .uneditable-input.span1 {
+  input, textarea, .uneditable-input {
+    margin-left: 0;
+  }
+  input > .span1, textarea > .span1, .uneditable-input > .span1 {
     width: 32px;
   }
-  input.span2, textarea.span2, .uneditable-input.span2 {
+  input > .span2, textarea > .span2, .uneditable-input > .span2 {
     width: 94px;
   }
-  input.span3, textarea.span3, .uneditable-input.span3 {
+  input > .span3, textarea > .span3, .uneditable-input > .span3 {
     width: 156px;
   }
-  input.span4, textarea.span4, .uneditable-input.span4 {
+  input > .span4, textarea > .span4, .uneditable-input > .span4 {
     width: 218px;
   }
-  input.span5, textarea.span5, .uneditable-input.span5 {
+  input > .span5, textarea > .span5, .uneditable-input > .span5 {
     width: 280px;
   }
-  input.span6, textarea.span6, .uneditable-input.span6 {
+  input > .span6, textarea > .span6, .uneditable-input > .span6 {
     width: 342px;
   }
-  input.span7, textarea.span7, .uneditable-input.span7 {
+  input > .span7, textarea > .span7, .uneditable-input > .span7 {
     width: 404px;
   }
-  input.span8, textarea.span8, .uneditable-input.span8 {
+  input > .span8, textarea > .span8, .uneditable-input > .span8 {
     width: 466px;
   }
-  input.span9, textarea.span9, .uneditable-input.span9 {
+  input > .span9, textarea > .span9, .uneditable-input > .span9 {
     width: 528px;
   }
-  input.span10, textarea.span10, .uneditable-input.span10 {
+  input > .span10, textarea > .span10, .uneditable-input > .span10 {
     width: 590px;
   }
-  input.span11, textarea.span11, .uneditable-input.span11 {
+  input > .span11, textarea > .span11, .uneditable-input > .span11 {
     width: 652px;
   }
-  input.span12, textarea.span12, .uneditable-input.span12 {
+  input > .span12, textarea > .span12, .uneditable-input > .span12 {
     width: 714px;
   }
 }
@@ -395,6 +450,7 @@
 @media (min-width: 980px) {
   .nav-collapse.collapse {
     height: auto !important;
+    overflow: visible !important;
   }
 }
 @media (min-width: 1200px) {
@@ -413,6 +469,9 @@
     float: left;
     margin-left: 30px;
   }
+  .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
+    width: 1170px;
+  }
   .span1 {
     width: 70px;
   }
@@ -446,7 +505,7 @@
   .span11 {
     width: 1070px;
   }
-  .span12, .container {
+  .span12 {
     width: 1170px;
   }
   .offset1 {
@@ -482,6 +541,9 @@
   .offset11 {
     margin-left: 1130px;
   }
+  .offset12 {
+    margin-left: 1230px;
+  }
   .row-fluid {
     width: 100%;
     *zoom: 1;
@@ -536,40 +598,43 @@
   .row-fluid > .span12 {
     width: 100%;
   }
-  input.span1, textarea.span1, .uneditable-input.span1 {
+  input, textarea, .uneditable-input {
+    margin-left: 0;
+  }
+  input > .span1, textarea > .span1, .uneditable-input > .span1 {
     width: 60px;
   }
-  input.span2, textarea.span2, .uneditable-input.span2 {
+  input > .span2, textarea > .span2, .uneditable-input > .span2 {
     width: 160px;
   }
-  input.span3, textarea.span3, .uneditable-input.span3 {
+  input > .span3, textarea > .span3, .uneditable-input > .span3 {
     width: 260px;
   }
-  input.span4, textarea.span4, .uneditable-input.span4 {
+  input > .span4, textarea > .span4, .uneditable-input > .span4 {
     width: 360px;
   }
-  input.span5, textarea.span5, .uneditable-input.span5 {
+  input > .span5, textarea > .span5, .uneditable-input > .span5 {
     width: 460px;
   }
-  input.span6, textarea.span6, .uneditable-input.span6 {
+  input > .span6, textarea > .span6, .uneditable-input > .span6 {
     width: 560px;
   }
-  input.span7, textarea.span7, .uneditable-input.span7 {
+  input > .span7, textarea > .span7, .uneditable-input > .span7 {
     width: 660px;
   }
-  input.span8, textarea.span8, .uneditable-input.span8 {
+  input > .span8, textarea > .span8, .uneditable-input > .span8 {
     width: 760px;
   }
-  input.span9, textarea.span9, .uneditable-input.span9 {
+  input > .span9, textarea > .span9, .uneditable-input > .span9 {
     width: 860px;
   }
-  input.span10, textarea.span10, .uneditable-input.span10 {
+  input > .span10, textarea > .span10, .uneditable-input > .span10 {
     width: 960px;
   }
-  input.span11, textarea.span11, .uneditable-input.span11 {
+  input > .span11, textarea > .span11, .uneditable-input > .span11 {
     width: 1060px;
   }
-  input.span12, textarea.span12, .uneditable-input.span12 {
+  input > .span12, textarea > .span12, .uneditable-input > .span12 {
     width: 1160px;
   }
   .thumbnails {