From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 30 Oct 2011 00:08:35 +0000 (-0700)
Subject: Merge branch 'master' of github.com:twitter/bootstrap into dev
X-Git-Tag: v1.4.0~8^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a30b8c05d26aa6c8e80c0b81f2fb3d979157a24;p=thirdparty%2Fbootstrap.git

Merge branch 'master' of github.com:twitter/bootstrap into dev

Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/forms.less
---

9a30b8c05d26aa6c8e80c0b81f2fb3d979157a24
diff --cc bootstrap.css
index 1bc26041b7,a778eb8085..d849cfb605
--- a/bootstrap.css
+++ b/bootstrap.css
@@@ -6,7 -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 Oct 28 18:57:30 PDT 2011
 - * Date: Mon Oct 10 14:31:07 CDT 2011
++ * Date: Sat Oct 29 17:08:31 PDT 2011
   */
  /* Reset.less
   * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@@ -811,69 -786,101 +811,101 @@@ select.xxlarge 
  textarea.xxlarge {
    overflow-y: auto;
  }
 -input.span1, textarea.span1, select.span1 {
 +input.span1, textarea.span1 {
    display: inline-block;
+   float: none;
    width: 30px;
+   margin-left: 0;
  }
 -input.span2, textarea.span2, select.span2 {
 +input.span2, textarea.span2 {
    display: inline-block;
+   float: none;
    width: 90px;
+   margin-left: 0;
  }
 -input.span3, textarea.span3, select.span3 {
 +input.span3, textarea.span3 {
    display: inline-block;
+   float: none;
    width: 150px;
+   margin-left: 0;
  }
 -input.span4, textarea.span4, select.span4 {
 +input.span4, textarea.span4 {
    display: inline-block;
+   float: none;
    width: 210px;
+   margin-left: 0;
  }
 -input.span5, textarea.span5, select.span5 {
 +input.span5, textarea.span5 {
    display: inline-block;
+   float: none;
    width: 270px;
+   margin-left: 0;
  }
 -input.span6, textarea.span6, select.span6 {
 +input.span6, textarea.span6 {
    display: inline-block;
+   float: none;
    width: 330px;
+   margin-left: 0;
  }
 -input.span7, textarea.span7, select.span7 {
 +input.span7, textarea.span7 {
    display: inline-block;
+   float: none;
    width: 390px;
+   margin-left: 0;
  }
 -input.span8, textarea.span8, select.span8 {
 +input.span8, textarea.span8 {
    display: inline-block;
+   float: none;
    width: 450px;
+   margin-left: 0;
  }
 -input.span9, textarea.span9, select.span9 {
 +input.span9, textarea.span9 {
    display: inline-block;
+   float: none;
    width: 510px;
+   margin-left: 0;
  }
 -input.span10, textarea.span10, select.span10 {
 +input.span10, textarea.span10 {
    display: inline-block;
+   float: none;
    width: 570px;
+   margin-left: 0;
  }
 -input.span11, textarea.span11, select.span11 {
 +input.span11, textarea.span11 {
    display: inline-block;
+   float: none;
    width: 630px;
+   margin-left: 0;
  }
 -input.span12, textarea.span12, select.span12 {
 +input.span12, textarea.span12 {
    display: inline-block;
+   float: none;
    width: 690px;
+   margin-left: 0;
  }
 -input.span13, textarea.span13, select.span13 {
 +input.span13, textarea.span13 {
    display: inline-block;
+   float: none;
    width: 750px;
+   margin-left: 0;
  }
 -input.span14, textarea.span14, select.span14 {
 +input.span14, textarea.span14 {
    display: inline-block;
+   float: none;
    width: 810px;
+   margin-left: 0;
  }
 -input.span15, textarea.span15, select.span15 {
 +input.span15, textarea.span15 {
    display: inline-block;
+   float: none;
    width: 870px;
+   margin-left: 0;
  }
 -input.span16, textarea.span16, select.span16 {
 +input.span16, textarea.span16 {
    display: inline-block;
+   float: none;
    width: 930px;
+   margin-left: 0;
  }
  input[disabled],
  select[disabled],
diff --cc bootstrap.min.css
index c6a99a74e6,b549f44e2f..2d806a639e
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@@ -141,28 -135,31 +141,28 @@@ form .clearfix.success .input-prepend .
  .input-xlarge,input.xlarge,textarea.xlarge,select.xlarge{width:270px;}
  .input-xxlarge,input.xxlarge,textarea.xxlarge,select.xxlarge{width:530px;}
  textarea.xxlarge{overflow-y:auto;}
- input.span1,textarea.span1{display:inline-block;width:30px;}
- input.span2,textarea.span2{display:inline-block;width:90px;}
- input.span3,textarea.span3{display:inline-block;width:150px;}
- input.span4,textarea.span4{display:inline-block;width:210px;}
- input.span5,textarea.span5{display:inline-block;width:270px;}
- input.span6,textarea.span6{display:inline-block;width:330px;}
- input.span7,textarea.span7{display:inline-block;width:390px;}
- input.span8,textarea.span8{display:inline-block;width:450px;}
- input.span9,textarea.span9{display:inline-block;width:510px;}
- input.span10,textarea.span10{display:inline-block;width:570px;}
- input.span11,textarea.span11{display:inline-block;width:630px;}
- input.span12,textarea.span12{display:inline-block;width:690px;}
- input.span13,textarea.span13{display:inline-block;width:750px;}
- input.span14,textarea.span14{display:inline-block;width:810px;}
- input.span15,textarea.span15{display:inline-block;width:870px;}
- input.span16,textarea.span16{display:inline-block;width:930px;}
 -input.span1,textarea.span1,select.span1{display:inline-block;float:none;width:30px;margin-left:0;}
 -input.span2,textarea.span2,select.span2{display:inline-block;float:none;width:90px;margin-left:0;}
 -input.span3,textarea.span3,select.span3{display:inline-block;float:none;width:150px;margin-left:0;}
 -input.span4,textarea.span4,select.span4{display:inline-block;float:none;width:210px;margin-left:0;}
 -input.span5,textarea.span5,select.span5{display:inline-block;float:none;width:270px;margin-left:0;}
 -input.span6,textarea.span6,select.span6{display:inline-block;float:none;width:330px;margin-left:0;}
 -input.span7,textarea.span7,select.span7{display:inline-block;float:none;width:390px;margin-left:0;}
 -input.span8,textarea.span8,select.span8{display:inline-block;float:none;width:450px;margin-left:0;}
 -input.span9,textarea.span9,select.span9{display:inline-block;float:none;width:510px;margin-left:0;}
 -input.span10,textarea.span10,select.span10{display:inline-block;float:none;width:570px;margin-left:0;}
 -input.span11,textarea.span11,select.span11{display:inline-block;float:none;width:630px;margin-left:0;}
 -input.span12,textarea.span12,select.span12{display:inline-block;float:none;width:690px;margin-left:0;}
 -input.span13,textarea.span13,select.span13{display:inline-block;float:none;width:750px;margin-left:0;}
 -input.span14,textarea.span14,select.span14{display:inline-block;float:none;width:810px;margin-left:0;}
 -input.span15,textarea.span15,select.span15{display:inline-block;float:none;width:870px;margin-left:0;}
 -input.span16,textarea.span16,select.span16{display:inline-block;float:none;width:930px;margin-left:0;}
++input.span1,textarea.span1{display:inline-block;float:none;width:30px;margin-left:0;}
++input.span2,textarea.span2{display:inline-block;float:none;width:90px;margin-left:0;}
++input.span3,textarea.span3{display:inline-block;float:none;width:150px;margin-left:0;}
++input.span4,textarea.span4{display:inline-block;float:none;width:210px;margin-left:0;}
++input.span5,textarea.span5{display:inline-block;float:none;width:270px;margin-left:0;}
++input.span6,textarea.span6{display:inline-block;float:none;width:330px;margin-left:0;}
++input.span7,textarea.span7{display:inline-block;float:none;width:390px;margin-left:0;}
++input.span8,textarea.span8{display:inline-block;float:none;width:450px;margin-left:0;}
++input.span9,textarea.span9{display:inline-block;float:none;width:510px;margin-left:0;}
++input.span10,textarea.span10{display:inline-block;float:none;width:570px;margin-left:0;}
++input.span11,textarea.span11{display:inline-block;float:none;width:630px;margin-left:0;}
++input.span12,textarea.span12{display:inline-block;float:none;width:690px;margin-left:0;}
++input.span13,textarea.span13{display:inline-block;float:none;width:750px;margin-left:0;}
++input.span14,textarea.span14{display:inline-block;float:none;width:810px;margin-left:0;}
++input.span15,textarea.span15{display:inline-block;float:none;width:870px;margin-left:0;}
++input.span16,textarea.span16{display:inline-block;float:none;width:930px;margin-left:0;}
  input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
  .actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}.actions .secondary-action{float:right;}.actions .secondary-action a{line-height:30px;}.actions .secondary-action a:hover{text-decoration:underline;}
 -.help-inline,.help-block{font-size:11px;line-height:18px;color:#bfbfbf;}
 +.help-inline,.help-block{font-size:13px;line-height:18px;color:#bfbfbf;}
  .help-inline{padding-left:5px;*position:relative;*top:-5px;}
  .help-block{display:block;max-width:600px;}
 -.inline-inputs{color:#808080;}.inline-inputs span,.inline-inputs input{display:inline-block;}
 -.inline-inputs input.mini{width:60px;}
 -.inline-inputs input.small{width:90px;}
 -.inline-inputs span{padding:0 2px 0 1px;}
 +.inline-inputs{color:#808080;}.inline-inputs span{padding:0 2px 0 1px;}
  .input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
  .input-prepend .add-on,.input-append .add-on{position:relative;background:#f5f5f5;border:1px solid #ccc;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;padding:4px 4px 4px 5px;margin-right:-1px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
  .input-prepend .active,.input-append .active{background:#a9dba9;border-color:#46a546;}
diff --cc docs/index.html
index e271cd3125,e5d1c56aef..f3bc821c2a
--- a/docs/index.html
+++ b/docs/index.html
@@@ -2018,16 -1928,5 +2018,16 @@@ Lorem ipsum dolar sit amet illo error <
        </div>
      </footer>
  
 +
 +    <!-- Le javascript -->
 +    <script src="http://code.jquery.com/jquery-1.5.2.min.js"></script>
 +    <script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script>
 +    <script src="assets/js/google-code-prettify/prettify.js"></script>
 +    <script>$(function () { prettyPrint() })</script>
 +    <script src="../js/bootstrap-dropdown.js"></script>
 +    <script src="../js/bootstrap-twipsy.js"></script>
 +    <script src="../js/bootstrap-scrollspy.js"></script>
 +    <script src="assets/js/application.js"></script>
 +
    </body>
- </html>
+ </html>
diff --cc lib/forms.less
index 2075ffd659,fed2c56086..e81dca5b46
--- a/lib/forms.less
+++ b/lib/forms.less
@@@ -254,10 -235,13 +254,12 @@@ textarea.xxlarge 
  // This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border
  .formColumns(@columnSpan: 1) {
    display: inline-block;
+   float: none;
    width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
+   margin-left: 0;
  }
  input,
 -textarea,
 -select {
 +textarea {
    // Default columns
    &.span1     { .formColumns(1); }
    &.span2     { .formColumns(2); }