diff options
| author | Mark Otto <[email protected]> | 2014-07-07 23:36:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-07 23:36:40 -0700 |
| commit | f5024eb13af16d87c75ce3ec4901fb445b5a1718 (patch) | |
| tree | 722db15445a57cbcc11213cfc7b5651b0fb2a559 /less/variables.less | |
| parent | 81b59d35368bc51d361d0352cc92fe99dc580fbf (diff) | |
| download | bootstrap-f5024eb13af16d87c75ce3ec4901fb445b5a1718.tar.xz bootstrap-f5024eb13af16d87c75ce3ec4901fb445b5a1718.zip | |
start the move to rems
Diffstat (limited to 'less/variables.less')
| -rw-r--r-- | less/variables.less | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/less/variables.less b/less/variables.less index c797ae08a..a375eac6f 100644 --- a/less/variables.less +++ b/less/variables.less @@ -14,7 +14,7 @@ @gray-light: lighten(@gray-base, 46.7%); // #777 @gray-lighter: lighten(@gray-base, 93.5%); // #eee -@brand-primary: #428bca; +@brand-primary: #027de7; @brand-success: #5cb85c; @brand-info: #5bc0de; @brand-warning: #f0ad4e; @@ -46,21 +46,22 @@ @font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; @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-root: 16px; +@font-size-base: 1rem; +@font-size-large: 1.25rem; +@font-size-small: .85rem; -@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.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 +@font-size-h1: 3rem; +@font-size-h2: 2.5rem; +@font-size-h3: 2rem; +@font-size-h4: 1.5rem; +@font-size-h5: 1.25rem; +@font-size-h6: 1rem; //** Unit-less `line-height` for use in components like buttons. -@line-height-base: 1.428571429; // 20/14 +@line-height-base: 1.5; // 20/14 //** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc. -@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px +@line-height-computed: (@font-size-root * @line-height-base); // ~20px //** By default, this inherits from the `<body>`. @headings-font-family: inherit; @@ -813,7 +814,7 @@ @kbd-color: #fff; @kbd-bg: #333; -@pre-bg: #f5f5f5; +@pre-bg: #f7f7f9; @pre-color: @gray-dark; @pre-border-color: #ccc; @pre-scrollable-max-height: 340px; |