From: Mark Otto <mark.otto@twitter.com>
Date: Thu, 17 Nov 2011 08:49:51 +0000 (-0800)
Subject: make uneditable inputs work with span* classes
X-Git-Tag: v2.0.0~6^2~428
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba9fcd8b57ad7974a52aecabac7c90dccda4afcb;p=thirdparty%2Fbootstrap.git

make uneditable inputs work with span* classes
---

diff --git a/bootstrap.css b/bootstrap.css
index c1de34a91c..b65126285f 100644
--- a/bootstrap.css
+++ b/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: Thu Nov 17 00:36:27 PST 2011
+ * Date: Thu Nov 17 00:48:46 PST 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).
@@ -657,97 +657,145 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus {
 .input-xxlarge {
   width: 530px;
 }
-input.span1, textarea.span1, select.span1 {
+input.span1,
+textarea.span1,
+select.span1,
+.uneditable-input.span1 {
   display: inline-block;
   float: none;
   width: 50px;
   margin-left: 0;
 }
-input.span2, textarea.span2, select.span2 {
+input.span2,
+textarea.span2,
+select.span2,
+.uneditable-input.span2 {
   display: inline-block;
   float: none;
   width: 150px;
   margin-left: 0;
 }
-input.span3, textarea.span3, select.span3 {
+input.span3,
+textarea.span3,
+select.span3,
+.uneditable-input.span3 {
   display: inline-block;
   float: none;
   width: 250px;
   margin-left: 0;
 }
-input.span4, textarea.span4, select.span4 {
+input.span4,
+textarea.span4,
+select.span4,
+.uneditable-input.span4 {
   display: inline-block;
   float: none;
   width: 350px;
   margin-left: 0;
 }
-input.span5, textarea.span5, select.span5 {
+input.span5,
+textarea.span5,
+select.span5,
+.uneditable-input.span5 {
   display: inline-block;
   float: none;
   width: 450px;
   margin-left: 0;
 }
-input.span6, textarea.span6, select.span6 {
+input.span6,
+textarea.span6,
+select.span6,
+.uneditable-input.span6 {
   display: inline-block;
   float: none;
   width: 550px;
   margin-left: 0;
 }
-input.span7, textarea.span7, select.span7 {
+input.span7,
+textarea.span7,
+select.span7,
+.uneditable-input.span7 {
   display: inline-block;
   float: none;
   width: 650px;
   margin-left: 0;
 }
-input.span8, textarea.span8, select.span8 {
+input.span8,
+textarea.span8,
+select.span8,
+.uneditable-input.span8 {
   display: inline-block;
   float: none;
   width: 750px;
   margin-left: 0;
 }
-input.span9, textarea.span9, select.span9 {
+input.span9,
+textarea.span9,
+select.span9,
+.uneditable-input.span9 {
   display: inline-block;
   float: none;
   width: 850px;
   margin-left: 0;
 }
-input.span10, textarea.span10, select.span10 {
+input.span10,
+textarea.span10,
+select.span10,
+.uneditable-input.span10 {
   display: inline-block;
   float: none;
   width: 950px;
   margin-left: 0;
 }
-input.span11, textarea.span11, select.span11 {
+input.span11,
+textarea.span11,
+select.span11,
+.uneditable-input.span11 {
   display: inline-block;
   float: none;
   width: 1050px;
   margin-left: 0;
 }
-input.span12, textarea.span12, select.span12 {
+input.span12,
+textarea.span12,
+select.span12,
+.uneditable-input.span12 {
   display: inline-block;
   float: none;
   width: 1150px;
   margin-left: 0;
 }
-input.span13, textarea.span13, select.span13 {
+input.span13,
+textarea.span13,
+select.span13,
+.uneditable-input.span13 {
   display: inline-block;
   float: none;
   width: 1250px;
   margin-left: 0;
 }
-input.span14, textarea.span14, select.span14 {
+input.span14,
+textarea.span14,
+select.span14,
+.uneditable-input.span14 {
   display: inline-block;
   float: none;
   width: 1350px;
   margin-left: 0;
 }
-input.span15, textarea.span15, select.span15 {
+input.span15,
+textarea.span15,
+select.span15,
+.uneditable-input.span15 {
   display: inline-block;
   float: none;
   width: 1450px;
   margin-left: 0;
 }
-input.span16, textarea.span16, select.span16 {
+input.span16,
+textarea.span16,
+select.span16,
+.uneditable-input.span16 {
   display: inline-block;
   float: none;
   width: 1550px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 3424525be7..b71f2c74f9 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -110,22 +110,22 @@ input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shado
 .input-large{width:210px;}
 .input-xlarge{width:270px;}
 .input-xxlarge{width:530px;}
-input.span1,textarea.span1,select.span1{display:inline-block;float:none;width:50px;margin-left:0;}
-input.span2,textarea.span2,select.span2{display:inline-block;float:none;width:150px;margin-left:0;}
-input.span3,textarea.span3,select.span3{display:inline-block;float:none;width:250px;margin-left:0;}
-input.span4,textarea.span4,select.span4{display:inline-block;float:none;width:350px;margin-left:0;}
-input.span5,textarea.span5,select.span5{display:inline-block;float:none;width:450px;margin-left:0;}
-input.span6,textarea.span6,select.span6{display:inline-block;float:none;width:550px;margin-left:0;}
-input.span7,textarea.span7,select.span7{display:inline-block;float:none;width:650px;margin-left:0;}
-input.span8,textarea.span8,select.span8{display:inline-block;float:none;width:750px;margin-left:0;}
-input.span9,textarea.span9,select.span9{display:inline-block;float:none;width:850px;margin-left:0;}
-input.span10,textarea.span10,select.span10{display:inline-block;float:none;width:950px;margin-left:0;}
-input.span11,textarea.span11,select.span11{display:inline-block;float:none;width:1050px;margin-left:0;}
-input.span12,textarea.span12,select.span12{display:inline-block;float:none;width:1150px;margin-left:0;}
-input.span13,textarea.span13,select.span13{display:inline-block;float:none;width:1250px;margin-left:0;}
-input.span14,textarea.span14,select.span14{display:inline-block;float:none;width:1350px;margin-left:0;}
-input.span15,textarea.span15,select.span15{display:inline-block;float:none;width:1450px;margin-left:0;}
-input.span16,textarea.span16,select.span16{display:inline-block;float:none;width:1550px;margin-left:0;}
+input.span1,textarea.span1,select.span1,.uneditable-input.span1{display:inline-block;float:none;width:50px;margin-left:0;}
+input.span2,textarea.span2,select.span2,.uneditable-input.span2{display:inline-block;float:none;width:150px;margin-left:0;}
+input.span3,textarea.span3,select.span3,.uneditable-input.span3{display:inline-block;float:none;width:250px;margin-left:0;}
+input.span4,textarea.span4,select.span4,.uneditable-input.span4{display:inline-block;float:none;width:350px;margin-left:0;}
+input.span5,textarea.span5,select.span5,.uneditable-input.span5{display:inline-block;float:none;width:450px;margin-left:0;}
+input.span6,textarea.span6,select.span6,.uneditable-input.span6{display:inline-block;float:none;width:550px;margin-left:0;}
+input.span7,textarea.span7,select.span7,.uneditable-input.span7{display:inline-block;float:none;width:650px;margin-left:0;}
+input.span8,textarea.span8,select.span8,.uneditable-input.span8{display:inline-block;float:none;width:750px;margin-left:0;}
+input.span9,textarea.span9,select.span9,.uneditable-input.span9{display:inline-block;float:none;width:850px;margin-left:0;}
+input.span10,textarea.span10,select.span10,.uneditable-input.span10{display:inline-block;float:none;width:950px;margin-left:0;}
+input.span11,textarea.span11,select.span11,.uneditable-input.span11{display:inline-block;float:none;width:1050px;margin-left:0;}
+input.span12,textarea.span12,select.span12,.uneditable-input.span12{display:inline-block;float:none;width:1150px;margin-left:0;}
+input.span13,textarea.span13,select.span13,.uneditable-input.span13{display:inline-block;float:none;width:1250px;margin-left:0;}
+input.span14,textarea.span14,select.span14,.uneditable-input.span14{display:inline-block;float:none;width:1350px;margin-left:0;}
+input.span15,textarea.span15,select.span15,.uneditable-input.span15{display:inline-block;float:none;width:1450px;margin-left:0;}
+input.span16,textarea.span16,select.span16,.uneditable-input.span16{display:inline-block;float:none;width:1550px;margin-left:0;}
 input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
 form .clearfix.error>label,form .clearfix.error .help-block,form .clearfix.error .help-inline{color:#b94a48;}
 form .clearfix.error input,form .clearfix.error textarea{color:#b94a48;border-color:#ee5f5b;}form .clearfix.error input:focus,form .clearfix.error textarea:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
diff --git a/lib/forms.less b/lib/forms.less
index adc050d7a8..f590101cd0 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -151,7 +151,8 @@ select:focus {
 }
 input,
 textarea,
-select {
+select,
+.uneditable-input {
   // Default columns
   &.span1     { .formColumns(1); }
   &.span2     { .formColumns(2); }