aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-05-09 15:05:06 -0700
committerMark Otto <[email protected]>2013-05-09 15:05:06 -0700
commit293a3baca36fb8788fb75d331439f143f6762fc1 (patch)
treeefdb5de54e654e82ce863fd1ec1ef0faa33256d9 /docs/assets/css/bootstrap.css
parent7a7971d6db31587d3b283178ddf9dc26a7d19cf8 (diff)
downloadbootstrap-293a3baca36fb8788fb75d331439f143f6762fc1.tar.xz
bootstrap-293a3baca36fb8788fb75d331439f143f6762fc1.zip
More forms overhaul
* Refactor the .forms-horizontal code--much simpler now and built on the Bootstrap grid system instead * Remove all the margins on form controls for simpler styling everywhere else--was overriding that way too often * Drop .help-inline, but keep .help-block * Drop the unused input grid class overrides
Diffstat (limited to 'docs/assets/css/bootstrap.css')
-rw-r--r--docs/assets/css/bootstrap.css84
1 files changed, 15 insertions, 69 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 03a26d13d..236256f64 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1252,7 +1252,6 @@ input[type="color"] {
display: block;
min-height: 34px;
padding: 6px 9px;
- margin-bottom: 10px;
font-size: 14px;
line-height: 20px;
color: #555555;
@@ -1374,6 +1373,7 @@ textarea::-webkit-input-placeholder {
display: block;
min-height: 20px;
padding-left: 20px;
+ margin-top: 10px;
margin-bottom: 10px;
vertical-align: middle;
}
@@ -1466,25 +1466,6 @@ input[type="color"].input-small {
border-radius: 3px;
}
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"] {
- float: none;
- margin-right: 0;
- margin-left: 0;
-}
-
-.input-append input[class*="span"],
-.input-prepend input[class*="span"] {
- display: inline-block;
-}
-
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"] {
- height: 34px;
-}
-
input[disabled],
select[disabled],
textarea[disabled],
@@ -1601,20 +1582,11 @@ select:focus:invalid:focus {
clear: both;
}
-.help-block,
-.help-inline {
- color: #737373;
-}
-
.help-block {
display: block;
+ margin-top: 5px;
margin-bottom: 10px;
-}
-
-.help-inline {
- display: inline-block;
- padding-left: 5px;
- vertical-align: middle;
+ color: #737373;
}
.input-group {
@@ -1790,47 +1762,21 @@ select:focus:invalid:focus {
.form-inline .radio,
.form-inline .checkbox {
display: inline-block;
+}
+
+.form-inline .radio,
+.form-inline .checkbox {
+ margin-top: 0;
margin-bottom: 0;
}
-@media screen and (min-width: 768px) {
- .form-horizontal .control-group {
- position: relative;
- margin-bottom: 20px;
- }
- .form-horizontal .control-group:before,
- .form-horizontal .control-group:after {
- display: table;
- content: " ";
- }
- .form-horizontal .control-group:after {
- clear: both;
- }
- .form-horizontal .control-group:before,
- .form-horizontal .control-group:after {
- display: table;
- content: " ";
- }
- .form-horizontal .control-group:after {
- clear: both;
- }
- .form-horizontal .control-group input,
- .form-horizontal .control-group select,
- .form-horizontal .control-group textarea {
- margin-bottom: 0;
- }
- .form-horizontal .control-group > .control-label {
- float: left;
- width: 160px;
- padding-top: 6px;
- text-align: right;
- }
- .form-horizontal .control-group > .controls {
- margin-left: 180px;
- }
- .form-horizontal .form-actions {
- padding-left: 180px;
- }
+.form-horizontal .row + .row {
+ margin-top: 15px;
+}
+
+.form-horizontal .row-label {
+ padding-top: 6px;
+ text-align: right;
}
.btn {