0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00

Merge branch '2.0.4-wip-forms' of github.com:twitter/bootstrap into 2.0.4-wip-forms

This commit is contained in:
Mark Otto 2012-05-15 09:07:31 -07:00
commit 6be09df1bf

View File

@ -117,6 +117,14 @@ input[type="color"],
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
@transition: border linear .2s, box-shadow linear .2s; @transition: border linear .2s, box-shadow linear .2s;
.transition(@transition); .transition(@transition);
// Focus state
&:focus {
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)");
}
} }
// Position radios and checkboxes better // Position radios and checkboxes better
@ -163,7 +171,13 @@ select[size] {
height: auto; height: auto;
} }
// Focus for select, file, radio, and checkbox
select:focus,
input[type="file"]:focus,
input[type="radio"]:focus,
input[type="checkbox"]:focus {
.tab-focus();
}
@ -204,26 +218,6 @@ select[size] {
// FOCUS STATE
// -----------
input:focus,
textarea:focus {
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)");
}
input[type="file"]:focus,
input[type="radio"]:focus,
input[type="checkbox"]:focus,
select:focus {
.tab-focus();
.box-shadow(none); // override for file inputs
}
// INPUT SIZES // INPUT SIZES
// ----------- // -----------
@ -254,8 +248,7 @@ textarea[class*="span"],
// GRID SIZING FOR INPUTS // GRID SIZING FOR INPUTS
// ---------------------- // ----------------------
#grid > .input (@gridColumnWidth, @gridGutterWidth); #grid > .input(@gridColumnWidth, @gridGutterWidth);