rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-07 04:54:24 +01:00
Code Issues Actions Packages Releases Activity

fix input grid sizing, fix background color on form actions and append add-ons

Browse Source
This commit is contained in:
Mark Otto 2012-03-05 23:06:27 -08:00
parent bcd9294cc4
commit 79090ac121
5 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

48
docs/assets/css/bootstrap-responsive.css vendored
View File

@ -306,40 +306,40 @@
input, textarea, .uneditable-input { input, textarea, .uneditable-input {
margin-left: 0; margin-left: 0;
} }
input > .span1, textarea > .span1, .uneditable-input > .span1 { input.span1, textarea.span1, .uneditable-input.span1 {
width: 32px; width: 32px;
} }
input > .span2, textarea > .span2, .uneditable-input > .span2 { input.span2, textarea.span2, .uneditable-input.span2 {
width: 94px; width: 94px;
} }
input > .span3, textarea > .span3, .uneditable-input > .span3 { input.span3, textarea.span3, .uneditable-input.span3 {
width: 156px; width: 156px;
} }
input > .span4, textarea > .span4, .uneditable-input > .span4 { input.span4, textarea.span4, .uneditable-input.span4 {
width: 218px; width: 218px;
} }
input > .span5, textarea > .span5, .uneditable-input > .span5 { input.span5, textarea.span5, .uneditable-input.span5 {
width: 280px; width: 280px;
} }
input > .span6, textarea > .span6, .uneditable-input > .span6 { input.span6, textarea.span6, .uneditable-input.span6 {
width: 342px; width: 342px;
} }
input > .span7, textarea > .span7, .uneditable-input > .span7 { input.span7, textarea.span7, .uneditable-input.span7 {
width: 404px; width: 404px;
} }
input > .span8, textarea > .span8, .uneditable-input > .span8 { input.span8, textarea.span8, .uneditable-input.span8 {
width: 466px; width: 466px;
} }
input > .span9, textarea > .span9, .uneditable-input > .span9 { input.span9, textarea.span9, .uneditable-input.span9 {
width: 528px; width: 528px;
} }
input > .span10, textarea > .span10, .uneditable-input > .span10 { input.span10, textarea.span10, .uneditable-input.span10 {
width: 590px; width: 590px;
} }
input > .span11, textarea > .span11, .uneditable-input > .span11 { input.span11, textarea.span11, .uneditable-input.span11 {
width: 652px; width: 652px;
} }
input > .span12, textarea > .span12, .uneditable-input > .span12 { input.span12, textarea.span12, .uneditable-input.span12 {
width: 714px; width: 714px;
} }
} }
@ -601,40 +601,40 @@
input, textarea, .uneditable-input { input, textarea, .uneditable-input {
margin-left: 0; margin-left: 0;
} }
input > .span1, textarea > .span1, .uneditable-input > .span1 { input.span1, textarea.span1, .uneditable-input.span1 {
width: 60px; width: 60px;
} }
input > .span2, textarea > .span2, .uneditable-input > .span2 { input.span2, textarea.span2, .uneditable-input.span2 {
width: 160px; width: 160px;
} }
input > .span3, textarea > .span3, .uneditable-input > .span3 { input.span3, textarea.span3, .uneditable-input.span3 {
width: 260px; width: 260px;
} }
input > .span4, textarea > .span4, .uneditable-input > .span4 { input.span4, textarea.span4, .uneditable-input.span4 {
width: 360px; width: 360px;
} }
input > .span5, textarea > .span5, .uneditable-input > .span5 { input.span5, textarea.span5, .uneditable-input.span5 {
width: 460px; width: 460px;
} }
input > .span6, textarea > .span6, .uneditable-input > .span6 { input.span6, textarea.span6, .uneditable-input.span6 {
width: 560px; width: 560px;
} }
input > .span7, textarea > .span7, .uneditable-input > .span7 { input.span7, textarea.span7, .uneditable-input.span7 {
width: 660px; width: 660px;
} }
input > .span8, textarea > .span8, .uneditable-input > .span8 { input.span8, textarea.span8, .uneditable-input.span8 {
width: 760px; width: 760px;
} }
input > .span9, textarea > .span9, .uneditable-input > .span9 { input.span9, textarea.span9, .uneditable-input.span9 {
width: 860px; width: 860px;
} }
input > .span10, textarea > .span10, .uneditable-input > .span10 { input.span10, textarea.span10, .uneditable-input.span10 {
width: 960px; width: 960px;
} }
input > .span11, textarea > .span11, .uneditable-input > .span11 { input.span11, textarea.span11, .uneditable-input.span11 {
width: 1060px; width: 1060px;
} }
input > .span12, textarea > .span12, .uneditable-input > .span12 { input.span12, textarea.span12, .uneditable-input.span12 {
width: 1160px; width: 1160px;
} }
.thumbnails { .thumbnails {

28
docs/assets/css/bootstrap.css vendored
View File

@ -739,40 +739,40 @@ textarea[class*="span"],
input, textarea, .uneditable-input { input, textarea, .uneditable-input {
margin-left: 0; margin-left: 0;
} }
input > .span1, textarea > .span1, .uneditable-input > .span1 { input.span1, textarea.span1, .uneditable-input.span1 {
width: 50px; width: 50px;
} }
input > .span2, textarea > .span2, .uneditable-input > .span2 { input.span2, textarea.span2, .uneditable-input.span2 {
width: 130px; width: 130px;
} }
input > .span3, textarea > .span3, .uneditable-input > .span3 { input.span3, textarea.span3, .uneditable-input.span3 {
width: 210px; width: 210px;
} }
input > .span4, textarea > .span4, .uneditable-input > .span4 { input.span4, textarea.span4, .uneditable-input.span4 {
width: 290px; width: 290px;
} }
input > .span5, textarea > .span5, .uneditable-input > .span5 { input.span5, textarea.span5, .uneditable-input.span5 {
width: 370px; width: 370px;
} }
input > .span6, textarea > .span6, .uneditable-input > .span6 { input.span6, textarea.span6, .uneditable-input.span6 {
width: 450px; width: 450px;
} }
input > .span7, textarea > .span7, .uneditable-input > .span7 { input.span7, textarea.span7, .uneditable-input.span7 {
width: 530px; width: 530px;
} }
input > .span8, textarea > .span8, .uneditable-input > .span8 { input.span8, textarea.span8, .uneditable-input.span8 {
width: 610px; width: 610px;
} }
input > .span9, textarea > .span9, .uneditable-input > .span9 { input.span9, textarea.span9, .uneditable-input.span9 {
width: 690px; width: 690px;
} }
input > .span10, textarea > .span10, .uneditable-input > .span10 { input.span10, textarea.span10, .uneditable-input.span10 {
width: 770px; width: 770px;
} }
input > .span11, textarea > .span11, .uneditable-input > .span11 { input.span11, textarea.span11, .uneditable-input.span11 {
width: 850px; width: 850px;
} }
input > .span12, textarea > .span12, .uneditable-input > .span12 { input.span12, textarea.span12, .uneditable-input.span12 {
width: 930px; width: 930px;
} }
input[disabled], input[disabled],
@ -853,7 +853,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
padding: 17px 20px 18px; padding: 17px 20px 18px;
margin-top: 18px; margin-top: 18px;
margin-bottom: 18px; margin-bottom: 18px;
background-color: #grayLight; background-color: #eeeeee;
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
*zoom: 1; *zoom: 1;
} }
@ -943,7 +943,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
line-height: 18px; line-height: 18px;
text-align: center; text-align: center;
text-shadow: 0 1px 0 #ffffff; text-shadow: 0 1px 0 #ffffff;
background-color: #grayLight; background-color: #eeeeee;
border: 1px solid #ccc; border: 1px solid #ccc;
-webkit-border-radius: 3px 0 0 3px; -webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px;

4
less/forms.less
View File

@ -314,7 +314,7 @@ select:focus:required:invalid {
padding: (@baseLineHeight - 1) 20px @baseLineHeight; padding: (@baseLineHeight - 1) 20px @baseLineHeight;
margin-top: @baseLineHeight; margin-top: @baseLineHeight;
margin-bottom: @baseLineHeight; margin-bottom: @baseLineHeight;
background-color: #grayLight; background-color: @grayLighter;
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
.clearfix(); // Adding clearfix to allow for .pull-right button containers .clearfix(); // Adding clearfix to allow for .pull-right button containers
} }
@ -387,7 +387,7 @@ select:focus:required:invalid {
line-height: @baseLineHeight; line-height: @baseLineHeight;
text-align: center; text-align: center;
text-shadow: 0 1px 0 @white; text-shadow: 0 1px 0 @white;
background-color: #grayLight; background-color: @grayLighter;
border: 1px solid #ccc; border: 1px solid #ccc;
.border-radius(3px 0 0 3px); .border-radius(3px 0 0 3px);
} }

24
less/mixins.less
View File

@ -577,18 +577,18 @@
textarea, textarea,
.uneditable-input { .uneditable-input {
margin-left: 0; // override margin-left from core grid system margin-left: 0; // override margin-left from core grid system
> .span1 { .span(1); } &.span1 { .span(1); }
> .span2 { .span(2); } &.span2 { .span(2); }
> .span3 { .span(3); } &.span3 { .span(3); }
> .span4 { .span(4); } &.span4 { .span(4); }
> .span5 { .span(5); } &.span5 { .span(5); }
> .span6 { .span(6); } &.span6 { .span(6); }
> .span7 { .span(7); } &.span7 { .span(7); }
> .span8 { .span(8); } &.span8 { .span(8); }
> .span9 { .span(9); } &.span9 { .span(9); }
> .span10 { .span(10); } &.span10 { .span(10); }
> .span11 { .span(11); } &.span11 { .span(11); }
> .span12 { .span(12); } &.span12 { .span(12); }
} }
} }