Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: #1390 Added two additional type sizes #1477

Merged
merged 3 commits into from
Jun 20, 2019
+28 −2
Merged

feat: #1390 Added two additional type sizes #1477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4a16ee
#1390: Addedt two additional type sizes
SaiShan Jun 4, 2019
17c7279
Merge branch 'master' of https://github.com/SAP/fundamental into upda…
SaiShan Jun 5, 2019
e270790
added missing type scale on playground
SaiShan Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions docs/pages/foundation/type.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ <h2 class="docs-header-h2">Sizes</h2>
<td class="fd-has-type-4 docs-type__scale--preview">a</td>
<td class="fd-has-type-5 docs-type__scale--preview">a</td>
<td class="fd-has-type-6 docs-type__scale--preview">a</td>
<td class="fd-has-type-7 docs-type__scale--preview">a</td>
<td class="fd-has-type-8 docs-type__scale--preview">a</td>
</tr>
<tr>
<td class="fd-has-type-1 docs-type__scale--info"><strong>-1</strong><br>12px</td>
Expand All @@ -50,6 +52,8 @@ <h2 class="docs-header-h2">Sizes</h2>
<td class="fd-has-type-1 docs-type__scale--info"><strong>4</strong><br>24px</td>
<td class="fd-has-type-1 docs-type__scale--info"><strong>5</strong><br>36px</td>
<td class="fd-has-type-1 docs-type__scale--info"><strong>6</strong><br>48px</td>
<td class="fd-has-type-1 docs-type__scale--info"><strong>7</strong><br>72px</td>
<td class="fd-has-type-1 docs-type__scale--info"><strong>8</strong><br>96px</td>

</td>
</tr>
Expand Down Expand Up @@ -133,6 +137,24 @@ <h4 class="docs-header-h4">6 — 48px | Line height 52px</h4>

<br>

<h4 class="docs-header-h4">7 — 72px | Line height 84px</h4>
<p><a href="/guides/how-to-use-scss.html#type-mixin" target="_blank">SCSS Mixin</a>: <code>@include fd-type("7")</code> &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp; <a href="/guides/design-system-utilities.html#type-sizes" target="_blank">Helper class</a>: <code>.fd-has-type-7</code></p>
{% capture type-preview %}
<p class="fd-has-type-7">Grumpy wizards make toxic brew for the evil Queen and Jack</p>
{% endcapture %}
{% include display-component.html component=type-preview %}

<br>

<h4 class="docs-header-h4">8 — 96px | Line height 102px</h4>
<p><a href="/guides/how-to-use-scss.html#type-mixin" target="_blank">SCSS Mixin</a>: <code>@include fd-type("8")</code> &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp; <a href="/guides/design-system-utilities.html#type-sizes" target="_blank">Helper class</a>: <code>.fd-has-type-8</code></p>
{% capture type-preview %}
<p class="fd-has-type-8">Grumpy wizards make toxic brew for the evil Queen and Jack</p>
{% endcapture %}
{% include display-component.html component=type-preview %}

<br>

<h2 class="docs-header-h2">Weights</h2>
<p>There are three weights defined <code>light</code>, <code>normal</code>, <code>Bold</code>.
</p>
Expand Down
2 changes: 2 additions & 0 deletions scss/_settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions test/templates/pages/styles.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
} %}


Expand All @@ -215,7 +217,7 @@
<h1>Type Sizes</h1>


{% 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] %}
<h2 style="margin-bottom:0;">{{i}}</h2>
<p>
Expand Down