Merge pull request twbs#11082 from ZDroid/nuke_zeros

Nuke trailing zeros
chrisnewman · Oct 14, 2013 · efc741b · efc741b
2 parents 3431f32 + b3c04c9
commit efc741b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/customize.html b/customize.html
@@ -417,11 +417,11 @@ <h4>Base type styes</h4>
       <div class="col-lg-6">
         <h4>Heading font sizes</h4>
         <label>@font-size-h1</label>
-        <input type="text" class="form-control" placeholder="floor(@font-size-base * 2.60)" data-var="@font-size-h1">
+        <input type="text" class="form-control" placeholder="floor(@font-size-base * 2.6)" data-var="@font-size-h1">
         <label>@font-size-h2</label>
         <input type="text" class="form-control" placeholder="floor(@font-size-base * 2.15)" data-var="@font-size-h2">
         <label>@font-size-h3</label>
-        <input type="text" class="form-control" placeholder="ceil(@font-size-base * 1.70)" data-var="@font-size-h3">
+        <input type="text" class="form-control" placeholder="ceil(@font-size-base * 1.7)" data-var="@font-size-h3">
         <label>@font-size-h4</label>
         <input type="text" class="form-control" placeholder="ceil(@font-size-base * 1.25)" data-var="@font-size-h4">
         <label>@font-size-h5</label>

diff --git a/less/variables.less b/less/variables.less
@@ -48,9 +48,9 @@
 @font-size-large:         ceil(@font-size-base * 1.25); // ~18px
 @font-size-small:         ceil(@font-size-base * 0.85); // ~12px
 
-@font-size-h1:            floor(@font-size-base * 2.60); // ~36px
+@font-size-h1:            floor(@font-size-base * 2.6); // ~36px
 @font-size-h2:            floor(@font-size-base * 2.15); // ~30px
-@font-size-h3:            ceil(@font-size-base * 1.70); // ~24px
+@font-size-h3:            ceil(@font-size-base * 1.7); // ~24px
 @font-size-h4:            ceil(@font-size-base * 1.25); // ~18px
 @font-size-h5:            @font-size-base;
 @font-size-h6:            ceil(@font-size-base * 0.85); // ~12px