aboutsummaryrefslogtreecommitdiff
path: root/less/variables.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-06-20 15:44:08 -0700
committerMark Otto <[email protected]>2013-06-20 15:44:08 -0700
commiteee719f608cd0e1fe9db7cd1206b1d4dc2078bd5 (patch)
treed551a6e2324622678cb869d3627a13131256440c /less/variables.less
parent1b89a63a48f0bfd6ba024f1cf573c03a42aa5ef2 (diff)
parent6a79f53899b0d1e02d41252d0753116b3a121cd0 (diff)
downloadbootstrap-eee719f608cd0e1fe9db7cd1206b1d4dc2078bd5.tar.xz
bootstrap-eee719f608cd0e1fe9db7cd1206b1d4dc2078bd5.zip
Merge pull request #8193 from mediafreakch/3.0.0-wip
Fixes broken layout for .input-group-addons within .input-large. Follows...
Diffstat (limited to 'less/variables.less')
-rw-r--r--less/variables.less4
1 files changed, 2 insertions, 2 deletions
diff --git a/less/variables.less b/less/variables.less
index e71dd03e1..f91846126 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -129,8 +129,8 @@
@input-color-placeholder: @gray-light;
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
-@input-height-large: (@line-height-computed + (@padding-large-vertical * 2) + 2);
-@input-height-small: (@line-height-computed + (@padding-small-vertical * 2) + 2);
+@input-height-large: (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2);
+@input-height-small: (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2);
// Dropdowns