From: Zlatan Vasović <legospace9876@gmail.com>
Date: Mon, 14 Oct 2013 13:06:58 +0000 (+0200)
Subject: Nuke trailing zeros
X-Git-Tag: v3.0.1~39^2~38^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3c04c95d3d378f8473e76169e40e044895ec849;p=thirdparty%2Fbootstrap.git

Nuke trailing zeros
---

diff --git a/customize.html b/customize.html
index be6011d39a..5b6a09c40d 100644
--- a/customize.html
+++ b/customize.html
@@ -417,11 +417,11 @@ base_url: "../"
       <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
index 9b55f13b69..e596215d06 100644
--- 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