aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-13 14:56:33 -0700
committerMark Otto <[email protected]>2013-08-13 14:56:33 -0700
commit3da3f7e4741aa0bc316b0c70ecee31df2783739b (patch)
tree915b4bdbdf601eb9cc455a492a386f0ceda018e2
parentbb059f28dea0463f44f265ad8f924d3cb508aa42 (diff)
parent78da4975e6392845b4a3614e06073628fe6e12cf (diff)
downloadbootstrap-3da3f7e4741aa0bc316b0c70ecee31df2783739b.tar.xz
bootstrap-3da3f7e4741aa0bc316b0c70ecee31df2783739b.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
-rw-r--r--less/forms.less4
1 files changed, 2 insertions, 2 deletions
diff --git a/less/forms.less b/less/forms.less
index 18d3efb54..a8847be2b 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -210,11 +210,11 @@ input[type="number"] {
// Form control sizing
.input-sm {
- .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
+ .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
}
.input-lg {
- .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
+ .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
}