rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Code Issues Actions Packages Releases Activity

correct regressions against 2.0.3

Browse Source
This commit is contained in:
Mark Otto 2012-05-15 00:17:02 -07:00
parent 87f6e426b3
commit ecf84bdac5
2 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -796,6 +796,11 @@ input[type="color"] {
color: #555555; color: #555555;
} }
input,
textarea {
width: 210px;
}
textarea, textarea,
input[type="text"], input[type="text"],
input[type="password"], input[type="password"],
@ -826,6 +831,24 @@ input[type="color"] {
transition: border linear 0.2s, box-shadow linear 0.2s; transition: border linear 0.2s, box-shadow linear 0.2s;
} }
input[type="radio"],
input[type="checkbox"] {
margin: 3px 0;
*margin-top: 0;
/* IE7 */
line-height: normal;
cursor: pointer;
}
input[type="submit"],
input[type="reset"],
input[type="button"],
input[type="radio"],
input[type="checkbox"] {
width: auto;
}
.uneditable-textarea { .uneditable-textarea {
width: auto; width: auto;
height: auto; height: auto;
@ -842,6 +865,11 @@ input[type="file"] {
line-height: 28px; line-height: 28px;
} }
select {
width: 220px;
border: 1px solid #bbb;
}
select[multiple], select[multiple],
select[size] { select[size] {
height: auto; height: auto;

37
less/forms.less
View File

@ -87,7 +87,13 @@ input[type="color"] {
color: @gray; color: @gray;
} }
// Reset background, border, and box-shadow for textual inputs and textarea // Reset appearance properties for textual inputs and textarea
// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
input,
textarea {
width: 210px;
}
// Everything else
textarea, textarea,
input[type="text"], input[type="text"],
input[type="password"], input[type="password"],
@ -111,21 +117,22 @@ input[type="color"] {
.transition(@transition); .transition(@transition);
} }
// Unused selectors // Position radios and checkboxes better
input[type="radio"], input[type="radio"],
input[type="checkbox"] { input[type="checkbox"] {
margin: 3px 0;
*margin-top: 0; /* IE7 */
line-height: normal;
cursor: pointer;
} }
input[type="button"],
// Reset width of input buttons, radios, checkboxes
input[type="submit"], input[type="submit"],
input[type="reset"] { input[type="reset"],
} input[type="button"],
input[type="file"] { input[type="radio"],
} input[type="checkbox"] {
input[type="hidden"] { width: auto; // Override of generic input selector
}
input[type="image"] {
}
input[type="range"] {
} }
// Make uneditable textareas behave like a textarea // Make uneditable textareas behave like a textarea
@ -142,6 +149,12 @@ input[type="file"] {
line-height: 28px; line-height: 28px;
} }
// Make select elements obey height by applying a border
select {
width: 220px; // default input width + 10px of padding that doesn't get applied
border: 1px solid #bbb;
}
// Make multiple select elements height not fixed // Make multiple select elements height not fixed
select[multiple], select[multiple],
select[size] { select[size] {