aboutsummaryrefslogtreecommitdiff
path: root/less/forms.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-22 08:12:51 -0800
committerMark Otto <[email protected]>2012-02-22 08:12:51 -0800
commit4410ede8ed976f449d9b1735652e081ed863a131 (patch)
tree0410d145f90d0084ff0a28e4f5d0cfec89b25257 /less/forms.less
parent92a54a7b723065ad6c64520b2a75b410682fc755 (diff)
parentf3b6cf1d6d65ccc640152aa4edb88cbea05a8b45 (diff)
downloadbootstrap-4410ede8ed976f449d9b1735652e081ed863a131.tar.xz
bootstrap-4410ede8ed976f449d9b1735652e081ed863a131.zip
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts: docs/assets/bootstrap.zip
Diffstat (limited to 'less/forms.less')
-rw-r--r--less/forms.less6
1 files changed, 3 insertions, 3 deletions
diff --git a/less/forms.less b/less/forms.less
index bc89bdc3f..9a0d3b849 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -253,7 +253,7 @@ textarea[class*="span"],
// GRID SIZING FOR INPUTS
// ----------------------
-#inputGridSystem > .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth);
+#grid > .input (@gridColumnWidth, @gridGutterWidth);
@@ -301,7 +301,7 @@ select:focus:required:invalid {
border-color: #ee5f5b;
&:focus {
border-color: darken(#ee5f5b, 10%);
- .box-shadow(0 0 6px lighten(#ee5f5b, 20%));
+ .box-shadow(0 0 6px lighten(#ee5f5b, 20%));
}
}
@@ -410,7 +410,7 @@ select:focus:required:invalid {
}
.uneditable-input {
border-left-color: #eee;
- border-right-color: #ccc;
+ border-right-color: #ccc;
}
.add-on {
margin-right: 0;