aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-12-21 19:32:14 -0600
committerMark Otto <[email protected]>2011-12-21 19:32:14 -0600
commit690d3f4d1aeb97a76d22a4dfe056e33606e0bd94 (patch)
tree22e68447e5d04464277fc342ff3eba4ff64e8923
parent369cedd87c4447241ce2a73ed6c8414a4cd8bdf8 (diff)
downloadbootstrap-690d3f4d1aeb97a76d22a4dfe056e33606e0bd94.tar.xz
bootstrap-690d3f4d1aeb97a76d22a4dfe056e33606e0bd94.zip
remove inline input field CSS since that's not required as all inputs are inline-block anyway
-rw-r--r--bootstrap.css17
-rw-r--r--bootstrap.min.css4
-rw-r--r--lib/forms.less21
3 files changed, 1 insertions, 41 deletions
diff --git a/bootstrap.css b/bootstrap.css
index fbd909de3..2ea7a8fbe 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: Wed Dec 21 19:30:30 CST 2011
+ * Date: Wed Dec 21 19:31:39 CST 2011
*/
html, body {
margin: 0;
@@ -904,21 +904,6 @@ textarea[readonly] {
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;
-}
.input-prepend, .input-append {
overflow: hidden;
}
diff --git a/bootstrap.min.css b/bootstrap.min.css
index e6cf50d16..f6587dd87 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -146,10 +146,6 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado
.help-text{margin-top:5px;margin-bottom:0;color:#bfbfbf;}
.help-inline{*position:relative;*top:-5px;display:inline;padding-left: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;}
.input-prepend,.input-append{overflow:hidden;}.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;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 4px 4px 5px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-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-color:#a9dba9;border-color:#46a546;}
diff --git a/lib/forms.less b/lib/forms.less
index 84fddd7d1..99d6fcb59 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -298,27 +298,6 @@ textarea[readonly] {
-// INLINE FIELDS
-// -------------
-
-.inline-inputs {
- color: @gray;
- span, input {
- display: inline-block;
- }
- input.mini {
- width: 60px;
- }
- input.small {
- width: 90px;
- }
- span {
- padding: 0 2px 0 1px;
- }
-}
-
-
-
// INPUT GROUPS
// ------------