Commit 76ecfdfd authored by Mark Otto's avatar Mark Otto

Font-size and line-height tweaks

* Use 1.428 for line-height instead of 1.5
* Use  function for full pixel values instead of decimals
parent 8261866f
This diff is collapsed.
...@@ -331,7 +331,7 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes." ...@@ -331,7 +331,7 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes."
<!-- Body copy --> <!-- Body copy -->
<h2 id="type-body-copy">Body copy</h2> <h2 id="type-body-copy">Body copy</h2>
<p>Bootstrap's global default <code>font-size</code> is <strong>14px</strong>, with a <code>line-height</code> of <strong>1.5</strong>. This is applied to the <code>&lt;body&gt;</code> and all paragraphs. In addition, <code>&lt;p&gt;</code> (paragraphs) receive a bottom margin of half their line-height (10px by default).</p> <p>Bootstrap's global default <code>font-size</code> is <strong>14px</strong>, with a <code>line-height</code> of <strong>1.428</strong>. This is applied to the <code>&lt;body&gt;</code> and all paragraphs. In addition, <code>&lt;p&gt;</code> (paragraphs) receive a bottom margin of half their computed line-height (10px by default).</p>
<div class="bs-example"> <div class="bs-example">
<p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p> <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p>
<p>Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.</p> <p>Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.</p>
......
...@@ -444,9 +444,6 @@ ...@@ -444,9 +444,6 @@
} }
} }
// Small grid columns // Small grid columns
.generate-grid-columns(@grid-columns) { .generate-grid-columns(@grid-columns) {
......
...@@ -46,12 +46,12 @@ ...@@ -46,12 +46,12 @@
@font-family-base: @font-family-sans-serif; @font-family-base: @font-family-sans-serif;
@font-size-base: 14px; @font-size-base: 14px;
@font-size-large: (@font-size-base * 1.25); // ~18px @font-size-large: ceil(@font-size-base * 1.25); // ~18px
@font-size-small: (@font-size-base * 0.85); // ~12px @font-size-small: ceil(@font-size-base * 0.85); // ~12px
@font-size-mini: (@font-size-base * 0.75); // ~11px @font-size-mini: ceil(@font-size-base * 0.75); // ~11px
@line-height-base: 1.5; @line-height-base: 1.428; // 20/14
@line-height-computed: (@font-size-base * @line-height-base); @line-height-computed: ceil(@font-size-base * @line-height-base); // ~20px
@line-height-headings: 1.1; @line-height-headings: 1.1;
@headings-font-family: inherit; // empty to use BS default, @font-family-base @headings-font-family: inherit; // empty to use BS default, @font-family-base
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment