diff --git a/bootstrap/less/variables.less b/bootstrap/less/variables.less index 121022319..9fe273aba 100644 --- a/bootstrap/less/variables.less +++ b/bootstrap/less/variables.less @@ -71,17 +71,22 @@ //@font-family-monospace: "Nova Mono", Menlo, Monaco, Consolas, monospace; //@font-family-base: @font-family-serif; +@mag1: sqrt(sqrt(2)); +@mag2: @mag1 * @mag1; +@mag3: @mag2 * @mag1; +@mag4: @mag3 * @mag1; +@maghalf: sqrt(@mag1); @font-size-base: 15px; -@font-size-large: ceil((@font-size-base * 1.189)); // ~18px -@font-size-small: ceil((@font-size-base * 0.841)); // ~12px +@font-size-large: ((@font-size-base * @mag1)); // 18px +@font-size-small: ((@font-size-base / @mag1)); // 13px -@font-size-h1: ceil((@font-size-base * 2.000)); // ~28px -@font-size-h2: ceil((@font-size-base * 1.681)); // ~24px -@font-size-h3: ceil((@font-size-base * 1.414)); // ~20px -@font-size-h4: ceil((@font-size-base * 1.189)); // ~16px -@font-size-h5: @font-size-base; +@font-size-h1: ceil((@font-size-base * @mag4)); // 31px +@font-size-h2: ceil((@font-size-base * @mag3)); // 26px +@font-size-h3: ceil((@font-size-base * @mag2)); // 22px +@font-size-h4: ceil((@font-size-base * @mag1)); // 18px +@font-size-h5: ceil((@font-size-base * @maghalf));// 16px @font-size-h6: @font-size-base; //** Unit-less `line-height` for use in components like buttons. @@ -594,7 +599,7 @@ //** Success label background color @label-success-bg: @brand-success; //** Info label background color -@label-info-bg: @brand-info; +@label-info-bg: darken(saturate(@brand-info, 5%), 12%); //** Warning label background color @label-warning-bg: @brand-warning; //** Danger label background color @@ -879,7 +884,7 @@ //** Blockquote small color @blockquote-small-color: @gray-light; //** Blockquote font size -@blockquote-font-size: (@font-size-base * 1.189); +@blockquote-font-size: (@font-size-base * @mag1); //** Blockquote border color @blockquote-border-color: @gray-lighter; //** Page header border color