Skip to content

Commit

Permalink
Fixes problem when running grunt and building with strict math.
Browse files Browse the repository at this point in the history
  • Loading branch information
mikael-ohmy committed Feb 26, 2018
1 parent a0d8608 commit db3246e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
16 changes: 8 additions & 8 deletions tt/bootswatch.less
Expand Up @@ -146,18 +146,18 @@ h1,h2 {
color:#000;
}

h1, .h1 { font-size: ceil(@font-size-base * 2.20); } // ~31px
h1, .h1 { font-size: ceil((@font-size-base * 2.20)); } // ~31px
@media (max-width: @screen-phone-max) {
h1, .h1 { font-size: ceil(@font-size-base * 1.70); } // ~27px
h1, .h1 { font-size: ceil((@font-size-base * 1.70)); } // ~27px
}
h2, .h2 { font-size: ceil(@font-size-base * 1.60); } // ~23px
h3, .h3 { font-size: ceil(@font-size-base * 1.30); } // ~19px
h4, .h4 { font-size: ceil(@font-size-base * 1.15); } // ~17px
h2, .h2 { font-size: ceil((@font-size-base * 1.60)); } // ~23px
h3, .h3 { font-size: ceil((@font-size-base * 1.30)); } // ~19px
h4, .h4 { font-size: ceil((@font-size-base * 1.15)); } // ~17px
h5, .h5 { font-size: @font-size-base; }
h6, .h6 { font-size: ceil(@font-size-base * 0.85); } // ~12px
h6, .h6 { font-size: ceil((@font-size-base * 0.85)); } // ~12px

h1 small, .h1 small { font-size: ceil(@font-size-base * 1.70); } // ~24px
h2 small, .h2 small { font-size: ceil(@font-size-base * 1.25); } // ~18px
h1 small, .h1 small { font-size: ceil((@font-size-base * 1.70)); } // ~24px
h2 small, .h2 small { font-size: ceil((@font-size-base * 1.25)); } // ~18px
h3 small, .h3 small,
h4 small, .h4 small { font-size: @font-size-base; }

Expand Down
12 changes: 6 additions & 6 deletions tt/variables.less
Expand Up @@ -78,11 +78,11 @@
@font-family-base: @font-family-sans-serif;

@font-size-base: 14px;
@font-size-large: ceil(@font-size-base * 1.25); // ~18px
@font-size-small: ceil(@font-size-base * 0.85); // ~12px
@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
@font-size-small: ceil((@font-size-base * 0.85)); // ~12px

@line-height-base: 1.714285714; // 24/14
@line-height-computed: floor(@font-size-base * @line-height-base); // ~24px
@line-height-computed: floor((@font-size-base * @line-height-base)); // ~24px

@headings-font-family: @font-family-base;
@headings-font-weight: 400;
Expand Down Expand Up @@ -183,8 +183,8 @@
@input-color-placeholder: @gray-light;

@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
@input-height-large: (floor(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
@input-height-large: (floor((@font-size-large * @line-height-large)) + (@padding-large-vertical * 2) + 2);
@input-height-small: (floor((@font-size-small * @line-height-small)) + (@padding-small-vertical * 2) + 2);

@legend-color: @gray-dark;
@legend-border-color: #e5e5e5;
Expand Down Expand Up @@ -282,7 +282,7 @@
@navbar-default-bg: #f8f8f8;
@navbar-default-border: darken(@navbar-default-bg, 6.5%);
@navbar-border-radius: @border-radius-base;
@navbar-padding-horizontal: floor(@grid-gutter-width / 2);
@navbar-padding-horizontal: floor((@grid-gutter-width / 2));
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);

// Navbar links
Expand Down

0 comments on commit db3246e

Please sign in to comment.