2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

update variables to inlude @baseFontSize, @baseFontFamily, @baseLineHeight for easier customization; added placeholder for @primaryButtonColor, but didn't implement

This commit is contained in:
Mark Otto
2011-10-04 00:20:38 -07:00
parent 0a6d8c30db
commit 96dd7a2903
9 changed files with 164 additions and 148 deletions
+15 -15
View File
@@ -8,16 +8,16 @@
// Make all forms have space below them
form {
margin-bottom: @baseline;
margin-bottom: @baseLineHeight;
}
// Groups of fields with labels on top (legends)
legend {
display: block;
width: 100%;
margin-bottom: @baseline * 1.5;
font-size: @basefont * 1.5;
line-height: @baseline * 2;
margin-bottom: @baseLineHeight * 1.5;
font-size: @baseFontSize * 1.5;
line-height: @baseLineHeight * 2;
color: @grayDark;
border-bottom: 1px solid #eee;
}
@@ -27,7 +27,7 @@ label,
input,
select,
textarea {
#font > .sans-serif(normal,@basefont,@baseline);
#font > .sans-serif(normal,@baseFontSize,@baseLineHeight);
}
// Identify controls by their labels
@@ -50,10 +50,10 @@ select,
.uneditable-input {
display: inline-block;
width: 210px;
height: @baseline;
height: @baseLineHeight;
padding: 4px;
font-size: @basefont;
line-height: @baseline;
font-size: @baseFontSize;
line-height: @baseLineHeight;
color: @gray;
border: 1px solid #ccc;
.border-radius(3px);
@@ -90,8 +90,8 @@ input[type=submit] {
select,
input[type=file] {
height: @baseline * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size
line-height: @baseline * 1.5;
height: @baseLineHeight * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size
line-height: @baseLineHeight * 1.5;
*margin-top: 4px; /* For IE7, add top margin to align select with labels */
}
@@ -200,7 +200,7 @@ textarea[readonly] {
// Style the background of control-groups with errors
.has-error {
background: lighten(@red, 55%);
padding: (@baseline / 2) 0;
padding: (@baseLineHeight / 2) 0;
margin: -10px 0 10px;
.border-radius(4px);
> label,
@@ -234,9 +234,9 @@ textarea[readonly] {
// ------------
.form-actions {
padding: (@baseline - 1) 20px @baseline;
margin-top: @baseline;
margin-bottom: @baseline;
padding: (@baseLineHeight - 1) 20px @baseLineHeight;
margin-top: @baseLineHeight;
margin-bottom: @baseLineHeight;
background-color: #f5f5f5;
border-top: 1px solid #ddd;
}
@@ -375,7 +375,7 @@ textarea[readonly] {
// Margin to space out fieldsets
.control-group {
margin-bottom: @baseline;
margin-bottom: @baseLineHeight;
}
// Bold the labels so they stand out