Update to Bootstrap 2.1.1, jQuery 1.8.1, Modernizr 2.6.2

This commit is contained in:
Ben Word
2012-09-04 23:34:13 -05:00
parent 8d76195661
commit f9959b4da0
26 changed files with 252 additions and 132 deletions

View File

@@ -91,8 +91,9 @@ input[type="color"],
// 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;
textarea,
.uneditable-input {
width: 206px; // plus 12px padding and 2px border
}
// Reset height since textareas have rows
textarea {
@@ -125,7 +126,7 @@ input[type="color"],
border-color: rgba(82,168,236,.8);
outline: 0;
outline: thin dotted \9; /* IE6-9 */
.box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6));
}
}
@@ -161,7 +162,7 @@ input[type="file"] {
// 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;
border: 1px solid @inputBorder;
background-color: @inputBackground; // Chrome on Linux and Mobile Safari need background-color
}
@@ -209,7 +210,7 @@ input[type="checkbox"]:focus {
// Placeholder
// -------------------------
// Placeholder text gets special styles; can't be bundled together though for some reason
// Placeholder text gets special styles because when browsers invalidate entire lines if it doesnt understand a selector
input,
textarea {
.placeholder();
@@ -349,6 +350,10 @@ input[type="checkbox"][readonly] {
.control-group.success {
.formFieldState(@successText, @successText, @successBackground);
}
// Success
.control-group.info {
.formFieldState(@infoText, @infoText, @infoBackground);
}
// HTML5 invalid states
// Shares styles with the .control-group.error above
@@ -441,7 +446,6 @@ select:focus:required:invalid {
}
.add-on,
.btn {
margin-left: -1px;
vertical-align: top;
.border-radius(0);
}
@@ -466,6 +470,10 @@ select:focus:required:invalid {
.uneditable-input {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
}
.add-on,
.btn {
margin-left: -1px;
}
.add-on:last-child,
.btn:last-child {
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
@@ -510,16 +518,16 @@ input.search-query {
.border-radius(0); // Override due to specificity
}
.form-search .input-append .search-query {
.border-radius(14px 0 0 14px)
.border-radius(14px 0 0 14px);
}
.form-search .input-append .btn {
.border-radius(0 14px 14px 0)
.border-radius(0 14px 14px 0);
}
.form-search .input-prepend .search-query {
.border-radius(0 14px 14px 0)
.border-radius(0 14px 14px 0);
}
.form-search .input-prepend .btn {
.border-radius(14px 0 0 14px)
.border-radius(14px 0 0 14px);
}
@@ -607,7 +615,7 @@ legend + .control-group {
// Float the labels left
.control-label {
float: left;
width: 140px;
width: @horizontalComponentOffset - 20;
padding-top: 5px;
text-align: right;
}
@@ -617,19 +625,26 @@ legend + .control-group {
// don't inherit the margin of the parent, in this case .controls
*display: inline-block;
*padding-left: 20px;
margin-left: 160px;
margin-left: @horizontalComponentOffset;
*margin-left: 0;
&:first-child {
*padding-left: 160px;
*padding-left: @horizontalComponentOffset;
}
}
// Remove bottom margin on block level help text since that's accounted for on .control-group
.help-block {
margin-top: @baseLineHeight / 2;
margin-bottom: 0;
}
// And apply it only to .help-block instances that follow a form control
input,
select,
textarea {
+ .help-block {
margin-top: @baseLineHeight / 2;
}
}
// Move over buttons in .form-actions to align with .controls
.form-actions {
padding-left: 160px;
padding-left: @horizontalComponentOffset;
}
}