From f4a16ee20b216a549d892159c91e5120d73b34ea Mon Sep 17 00:00:00 2001 From: SaiShan Date: Tue, 4 Jun 2019 10:51:25 -0400 Subject: [PATCH 1/2] #1390: Addedt two additional type sizes --- docs/pages/foundation/type.html | 22 ++++++++++++++++++++++ scss/_settings.scss | 2 ++ 2 files changed, 24 insertions(+) diff --git a/docs/pages/foundation/type.html b/docs/pages/foundation/type.html index c4c7eebe1..da698d384 100644 --- a/docs/pages/foundation/type.html +++ b/docs/pages/foundation/type.html @@ -40,6 +40,8 @@

Sizes

a a a + a + a -1
12px @@ -50,6 +52,8 @@

Sizes

4
24px 5
36px 6
48px + 7
72px + 8
96px @@ -133,6 +137,24 @@

6 — 48px | Line height 52px


+

7 — 72px | Line height 84px

+

SCSS Mixin: @include fd-type("7")    |    Helper class: .fd-has-type-7

+{% capture type-preview %} +

Grumpy wizards make toxic brew for the evil Queen and Jack

+{% endcapture %} +{% include display-component.html component=type-preview %} + +
+ +

8 — 96px | Line height 102px

+

SCSS Mixin: @include fd-type("8")    |    Helper class: .fd-has-type-8

+{% capture type-preview %} +

Grumpy wizards make toxic brew for the evil Queen and Jack

+{% endcapture %} +{% include display-component.html component=type-preview %} + +
+

Weights

There are three weights defined light, normal, Bold.

diff --git a/scss/_settings.scss b/scss/_settings.scss index 41ab81724..69a1b0dc5 100644 --- a/scss/_settings.scss +++ b/scss/_settings.scss @@ -59,6 +59,8 @@ $fd-type: map-merge(( "4": #{24/$fd-type--base}rem 32/24 16px, //23/32 16 "5": #{36/$fd-type--base}rem 40/36 20px, //36/40 20 "6": #{48/$fd-type--base}rem 52/48 24px, //48/52 24 + "7": #{72/$fd-type--base}rem 84/72 32px, //84/72 32 + "8": #{96/$fd-type--base}rem 105/96 36px, //105/96 36 ), $fd-type); $fd-font-size: #{$fd-type--base}px !default; From e27079075cc0bdd4c54f10e4a8b33b1accfac3c6 Mon Sep 17 00:00:00 2001 From: SaiShan Date: Wed, 5 Jun 2019 11:56:04 -0400 Subject: [PATCH 2/2] added missing type scale on playground --- test/templates/pages/styles.njk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/templates/pages/styles.njk b/test/templates/pages/styles.njk index 5768f396b..80d35002d 100644 --- a/test/templates/pages/styles.njk +++ b/test/templates/pages/styles.njk @@ -205,7 +205,9 @@ "3": [ 20, 28 ], "4": [ 24, 32 ], "5": [ 36, 40 ], - "6": [ 48, 52 ] + "6": [ 48, 52 ], + "7": [ 72, 84 ], + "8": [ 96, 102 ] } %} @@ -215,7 +217,7 @@

Type Sizes

- {% for i in ["-1","0","1","2","3","4","5","6"] | reverse %} + {% for i in ["-1","0","1","2","3","4","5","6","7","8"] | reverse %} {% set type = specs[i] %}

{{i}}