aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-05 23:06:27 -0800
committerMark Otto <[email protected]>2012-03-05 23:06:27 -0800
commit79090ac12115bb5402a4756e791fb14dd7a1257b (patch)
tree91f3b4443885aa5d90b075f4d942d0818ffb7a4a /docs
parentbcd9294cc43dcf712314fa3633531812cad39adb (diff)
downloadbootstrap-79090ac12115bb5402a4756e791fb14dd7a1257b.tar.xz
bootstrap-79090ac12115bb5402a4756e791fb14dd7a1257b.zip
fix input grid sizing, fix background color on form actions and append add-ons
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin54920 -> 54895 bytes
-rw-r--r--docs/assets/css/bootstrap-responsive.css48
-rw-r--r--docs/assets/css/bootstrap.css28
3 files changed, 38 insertions, 38 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 069beaf06..e4d53ed8b 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 447a865c8..c327f7f07 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -306,40 +306,40 @@
input, textarea, .uneditable-input {
margin-left: 0;
}
- input > .span1, textarea > .span1, .uneditable-input > .span1 {
+ 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;
}
}
@@ -601,40 +601,40 @@
input, textarea, .uneditable-input {
margin-left: 0;
}
- input > .span1, textarea > .span1, .uneditable-input > .span1 {
+ 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 {
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 5ec2dba8e..a2d178eb4 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -739,40 +739,40 @@ textarea[class*="span"],
input, textarea, .uneditable-input {
margin-left: 0;
}
-input > .span1, textarea > .span1, .uneditable-input > .span1 {
+input.span1, textarea.span1, .uneditable-input.span1 {
width: 50px;
}
-input > .span2, textarea > .span2, .uneditable-input > .span2 {
+input.span2, textarea.span2, .uneditable-input.span2 {
width: 130px;
}
-input > .span3, textarea > .span3, .uneditable-input > .span3 {
+input.span3, textarea.span3, .uneditable-input.span3 {
width: 210px;
}
-input > .span4, textarea > .span4, .uneditable-input > .span4 {
+input.span4, textarea.span4, .uneditable-input.span4 {
width: 290px;
}
-input > .span5, textarea > .span5, .uneditable-input > .span5 {
+input.span5, textarea.span5, .uneditable-input.span5 {
width: 370px;
}
-input > .span6, textarea > .span6, .uneditable-input > .span6 {
+input.span6, textarea.span6, .uneditable-input.span6 {
width: 450px;
}
-input > .span7, textarea > .span7, .uneditable-input > .span7 {
+input.span7, textarea.span7, .uneditable-input.span7 {
width: 530px;
}
-input > .span8, textarea > .span8, .uneditable-input > .span8 {
+input.span8, textarea.span8, .uneditable-input.span8 {
width: 610px;
}
-input > .span9, textarea > .span9, .uneditable-input > .span9 {
+input.span9, textarea.span9, .uneditable-input.span9 {
width: 690px;
}
-input > .span10, textarea > .span10, .uneditable-input > .span10 {
+input.span10, textarea.span10, .uneditable-input.span10 {
width: 770px;
}
-input > .span11, textarea > .span11, .uneditable-input > .span11 {
+input.span11, textarea.span11, .uneditable-input.span11 {
width: 850px;
}
-input > .span12, textarea > .span12, .uneditable-input > .span12 {
+input.span12, textarea.span12, .uneditable-input.span12 {
width: 930px;
}
input[disabled],
@@ -853,7 +853,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
padding: 17px 20px 18px;
margin-top: 18px;
margin-bottom: 18px;
- background-color: #grayLight;
+ background-color: #eeeeee;
border-top: 1px solid #ddd;
*zoom: 1;
}
@@ -943,7 +943,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
line-height: 18px;
text-align: center;
text-shadow: 0 1px 0 #ffffff;
- background-color: #grayLight;
+ background-color: #eeeeee;
border: 1px solid #ccc;
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;