From 8644c74eb7818fd7b43773d8924de7897421fe23 Mon Sep 17 00:00:00 2001 From: jshores Date: Tue, 17 May 2016 12:31:33 -0500 Subject: [PATCH 1/2] Updated sizes of H tags --- scss/_typography.scss | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/scss/_typography.scss b/scss/_typography.scss index c1dd210..9182f70 100644 --- a/scss/_typography.scss +++ b/scss/_typography.scss @@ -7,15 +7,25 @@ $base-font-family: "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, " // Base typography // ---------------------------------------------- -h1, +h1 { + margin: 0; + padding: 0; + font-weight: 700; +} h2, h3, h4, -h5, h6 { margin: 0; padding: 0; - font-weight: 400; + font-weight: 500; +} + +h5 { + margin: 0; + padding: 0; + font-weight: normal; + text-transform: uppercase; } body { @@ -28,12 +38,12 @@ strong { } // Create placeholder selectors -%h1 { font-size: round(2.5 * $base-font-size); } // 35px -%h2 { font-size: round(2 * $base-font-size); } // 28px -%h3 { font-size: round(1.65 * $base-font-size); } // 23px -%h4 { font-size: round(1.42 * $base-font-size); } // 20px -%h5 { font-size: round(1.28 * $base-font-size); } // 18px -%h6 { font-size: round($base-font-size); } // 14px +%h1 { font-size: round(1.72 * $base-font-size); } // 24px +%h2 { font-size: round(1.45 * $base-font-size); } // 20px +%h3 { font-size: round(1.15 * $base-font-size); } // 16px +%h4 { font-size: round($base-font-size); } // 14px +%h5 { font-size: round($base-font-size / 1.2); } // 12px +%h6 { font-size: round($base-font-size / 1.2); } // 12px h1 { @extend %h1; } h2 { @extend %h2; } @@ -51,4 +61,4 @@ h1 .secondary, h2 .secondary, h3 .secondary { font-weight: 300; -} \ No newline at end of file +} From 2c61025bca573b87444e2dc9fad2807d2fa8bda8 Mon Sep 17 00:00:00 2001 From: jshores Date: Tue, 17 May 2016 12:33:12 -0500 Subject: [PATCH 2/2] Updated size text for example --- docs/contents/style/03-typography.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/contents/style/03-typography.md b/docs/contents/style/03-typography.md index ec0ea6d..d7c0f7b 100644 --- a/docs/contents/style/03-typography.md +++ b/docs/contents/style/03-typography.md @@ -3,12 +3,12 @@ ### Headings {{#example 'html'}} -

h1. Heading

-

h2. Heading

-

h3. Heading

-

h4. Heading

-
h5. Heading
-
h6. Heading
+

h1. Heading

+

h2. Heading

+

h3. Heading

+

h4. Heading

+
h5. Heading
+
h6. Heading
{{/example}} For headings, we're using [sass placeholders](http://sass-lang.com/documentation/file.SASS_REFERENCE.html#placeholder_selectors_) to set the appropriate font size for our headings. If you need to match a heading size with a particular element, you can do so by using `@extend` along with the placeholder name. @@ -74,4 +74,4 @@ You can style inline text elements.

This text is subscript

{{/example}} -test \ No newline at end of file +test