Skip to content

Commit 022f009

Browse files
Cathy SillerRyan A. Johnson
authored andcommitted
feat(typography): update typography based on redline specs
1 parent eda3a4b commit 022f009

File tree

18 files changed

+298
-204
lines changed

18 files changed

+298
-204
lines changed

source/_less/vars.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
@gray-500: #bdbdbd;
1010
@gray-600: #9e9e9e;
1111
@gray-700: #757575;
12+
@gray-750: #6b6b6b;
1213
@gray-800: #616161;
1314
@gray-900: #424242;
1415
@gray-950: #333333;

source/_templates/component.njk

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@
22

33
{% block layout %}
44
<article>
5-
<header class="page-header">
6-
<span class="page-title">
7-
{{ page.title }}
8-
{% if page.subtitle %}
9-
<br />
10-
<small>{{ page.subtitle }}</small>
11-
{% endif %}
12-
</span>
13-
</header>
5+
<h1 class="hxPageTitle">
6+
{{ page.title }}
7+
</h1>
148

159
<div class="hxRow">
1610
<div class="hxCol-xs-12 hxCol-md-3 hxOrder-md-2">

source/components/alert/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!-- explanation goes here -->
99

1010
<section>
11-
<h2 id="default">Default</h2>
11+
<h2 class="hxSectionTitle" id="default">Default</h2>
1212

1313
<div class="demo">
1414
<div role="status" class="hxAlerts" aria-live="polite">
@@ -47,7 +47,7 @@ <h2 id="default">Default</h2>
4747
</section>
4848

4949
<section>
50-
<h2 id="error">Error</h2>
50+
<h2 class="hxSectionTitle" id="error">Error</h2>
5151

5252
<div class="demo">
5353
<div role="status" class="hxAlerts" aria-live="polite">
@@ -86,7 +86,7 @@ <h2 id="error">Error</h2>
8686
</section>
8787

8888
<section>
89-
<h2 id="warning">Warning</h2>
89+
<h2 class="hxSectionTitle" id="warning">Warning</h2>
9090

9191
<div class="demo">
9292
<div role="status" class="hxAlerts" aria-live="polite">
@@ -125,7 +125,7 @@ <h2 id="warning">Warning</h2>
125125
</section>
126126

127127
<section>
128-
<h2 id="success">Success</h2>
128+
<h2 class="hxSectionTitle" id="success">Success</h2>
129129

130130
<div class="demo">
131131
<div role="status" class="hxAlerts" aria-live="polite">

source/components/blockquote/index.html

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
<!-- explanation goes here -->
99

1010
<section>
11-
<header>
12-
<h2 id="default">Default Blockquotes</h2>
13-
</header>
11+
<h2 class="hxSectionTitle" id="default">Default Blockquotes</h2>
1412

1513
<!-- explanation goes here -->
1614

@@ -23,9 +21,9 @@ <h2 id="default">Default Blockquotes</h2>
2321
</section>
2422

2523
<section><!-- Blockquotes -->
26-
<header>
27-
<h2 id="right-aligned">Right-Aligned Blockquotes</h1>
28-
</header>
24+
<h2 class="hxSectionTitle" id="right-aligned">Right-Aligned Blockquotes</h2>
25+
26+
<!-- explanation goes here -->
2927

3028
<div class="demo">
3129
<blockquote class="blockquote-reverse">

source/components/breadcrumb/breadcrumb.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
align-content: center;
44
align-items: center;
55
display: flex;
6-
font-size: 12px;
6+
font-size: 0.75rem;
77
font-weight: 500;
88
height: 1.75rem;
99
margin-bottom: 1rem;

source/components/button/index.html

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
<!-- explanation goes here -->
99

1010
<section>
11-
<header>
12-
<h2 id="size-variants">Size Variants</h2>
13-
</header>
11+
<h2 class="hxSectionTitle" id="size-variants">Size Variants</h2>
1412

1513
<!-- explanation goes here -->
1614

@@ -24,9 +22,7 @@ <h2 id="size-variants">Size Variants</h2>
2422
</section>
2523

2624
<section>
27-
<header>
28-
<h2 id="default">Default Buttons</h2>
29-
</header>
25+
<h2 class="hxSectionTitle" id="default">Default Buttons</h2>
3026

3127
<!-- explanation goes here -->
3228

@@ -39,9 +35,7 @@ <h2 id="default">Default Buttons</h2>
3935
</section>
4036

4137
<section>
42-
<header>
43-
<h2 id="default">Primary Buttons</h2>
44-
</header>
38+
<h2 class="hxSectionTitle" id="default">Primary Buttons</h2>
4539

4640
<!-- explanation goes here -->
4741

@@ -54,10 +48,8 @@ <h2 id="default">Primary Buttons</h2>
5448
</section>
5549

5650
<section>
57-
<header>
58-
<h2 id="default">Link Buttons</h2>
59-
</header>
60-
51+
<h2 class="hxSectionTitle" id="link-buttons">Link Buttons</h2>
52+
6153
<!-- explanation goes here -->
6254

6355
<div class="demo">

source/components/code/index.html

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
<!-- explanation goes here -->
99

1010
<section><!-- Inline Code -->
11-
<h2 id="inline">Inline</h2>
11+
<h2 class="hxSectionTitle" id="inline">Inline</h2>
12+
13+
<!-- explanation goes here -->
14+
1215
<div class="demo">
1316
<p>
1417
Add an event listener with the <code>EventTarget.addEventListener()</code> function.
@@ -22,7 +25,7 @@ <h2 id="inline">Inline</h2>
2225
</section>
2326

2427
<section><!-- Keyboard -->
25-
<h2 id="keyboard">Keyboard</h2>
28+
<h2 class="hxSectionTitle" id="keyboard">Keyboard</h2>
2629
<div class="demo">
2730
<p>
2831
Press <kbd>Ctrl+Z</kbd> (<kbd>Command+Z</kbd> on Mac)
@@ -38,7 +41,10 @@ <h2 id="keyboard">Keyboard</h2>
3841
</section>
3942

4043
<section>
41-
<h2 id="code-block">Code Block</h2>
44+
<h2 class="hxSectionTitle" id="code-block">Code Block</h2>
45+
46+
<!-- explanation goes here -->
47+
4248
<div class="demo">
4349
<pre><code>[Insert Code Here]</code></pre>
4450
</div>
@@ -48,7 +54,7 @@ <h2 id="code-block">Code Block</h2>
4854
</section>
4955

5056
<section><!-- Syntax Highlighting -->
51-
<h2 id="syntax-highlighting">Syntax Highlighting</h2>
57+
<h2 class="hxSectionTitle" id="syntax-highlighting">Syntax Highlighting</h2>
5258
<p>
5359
HelixUI provides a built-in theme for use with the
5460
<a href="https://highlightjs.org/">highlight.js</a> library.

source/components/grid/index.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
---
66
{% extends 'component.njk' %}
77
{% block content %}
8-
<h2>12-column Grid</h2>
8+
<h2 class="hxSectionTitle">12-column Grid</h2>
99
<p>
1010
The grid system requires loading <code>helix-ui.css</code> into your application.
1111
</p>
1212

1313
<section>
14-
<h3 id="bootstrap">Bootstrap Compatibility</h3>
14+
<h3 class="hxSubSectionTitle" id="bootstrap">Bootstrap Compatibility</h3>
1515
<ol>
1616
<li>
1717
<b>Avoid using Bootstrap containers</b>
@@ -35,7 +35,7 @@ <h3 id="bootstrap">Bootstrap Compatibility</h3>
3535
</section>
3636

3737
<section>
38-
<h3 id="automatic">Automatic Columns</h3>
38+
<h3 class="hxSubSectionTitle" id="automatic">Automatic Columns</h3>
3939
<div class="alert alert-info">
4040
<p>
4141
<b>NOTE:</b> Automatic columns are overridden by <a href="#responsive">responsive classes</a>.
@@ -92,7 +92,7 @@ <h3 id="automatic">Automatic Columns</h3>
9292
</section>
9393

9494
<section>
95-
<h3 id="explicit">Explicit Columns</h3>
95+
<h3 class="hxSubSectionTitle" id="explicit">Explicit Columns</h3>
9696
<div class="alert alert-info">
9797
<p>
9898
If the sum of a row's columns exceeds 12, the columns will wrap.
@@ -182,7 +182,7 @@ <h3 id="explicit">Explicit Columns</h3>
182182
</section>
183183

184184
<section>
185-
<h3 id="nesting">Nesting Elements</h3>
185+
<h3 class="hxSubSectionTitle" id="nesting">Nesting Elements</h3>
186186
<div class="alert alert-info">
187187
<p>
188188
<b>Do not apply row and column classes to the same element.</b>
@@ -245,7 +245,7 @@ <h3 id="nesting">Nesting Elements</h3>
245245
</section>
246246

247247
<section>
248-
<h3 id="offsetting">Offsetting Columns</h3>
248+
<h3 class="hxSubSectionTitle" id="offsetting">Offsetting Columns</h3>
249249
<p>
250250
You can use the <code>.hxOffset-N</code> class (1 &le; N &le; 11)
251251
to offset your column from the start of the row.
@@ -326,7 +326,7 @@ <h3 id="offsetting">Offsetting Columns</h3>
326326
</section>
327327

328328
<section>
329-
<h3 id="reordering">Reordering Columns</h3>
329+
<h3 class="hxSubSectionTitle" id="reordering">Reordering Columns</h3>
330330
<p>
331331
Use the <code>.hxOrder-N</code> classes (1 &le; N &le; 12) to
332332
reorder your columns.
@@ -368,7 +368,7 @@ <h3 id="reordering">Reordering Columns</h3>
368368
</section>
369369

370370
<section>
371-
<h3 id="responsive">Responsive Layout</h3>
371+
<h3 class="hxSubSectionTitle" id="responsive">Responsive Layout</h3>
372372
<div class="alert alert-info">
373373
<p>
374374
Responsive column classes override <a href="#automatic">automatic columns</a>.
@@ -464,7 +464,7 @@ <h3 id="responsive">Responsive Layout</h3>
464464
</section>
465465

466466
<section>
467-
<h3 id="wrapping">Column Wrapping</h3>
467+
<h3 class="hxSubSectionTitle" id="wrapping">Column Wrapping</h3>
468468
<p>
469469
The following example should arrange the content into 3 columns on small
470470
screens, 4 columns on medium screens, and 6 columns on all other sizes.
@@ -536,7 +536,7 @@ <h3 id="wrapping">Column Wrapping</h3>
536536
</section>
537537

538538
<section>
539-
<h3 id="styling">Styling the Grid</h3>
539+
<h3 class="hxSubSectionTitle" id="styling">Styling the Grid</h3>
540540
<div class="alert alert-info">
541541
<p>
542542
<b>Avoid styling rows and columns.</b>

source/components/icon/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</p>
2121

2222
<section>
23-
<h2 id="syntax">Example</h2>
23+
<h2 class="hxSectionTitle" id="syntax">Example</h2>
2424
<p>
2525
Set the <code>type</code> attribute to any value <a href="#icon-types">listed below</a>.
2626
</p>
@@ -55,7 +55,7 @@ <h2 id="syntax">Example</h2>
5555
</section>
5656

5757
<section>
58-
<h2 id="styling">Styling</h2>
58+
<h2 class="hxSectionTitle" id="styling">Styling</h2>
5959
<div class="alert alert-info">
6060
Icons inherit the <code>color</code> and <code>background-color</code>
6161
of their parent.
@@ -79,7 +79,7 @@ <h2 id="styling">Styling</h2>
7979
</section>
8080

8181
<section>
82-
<h2 id="icon-types">Icon Types</h2>
82+
<h2 class="hxSectionTitle" id="icon-types">Icon Types</h2>
8383
<p>There are {{ data.icons.length }} icons available!</p>
8484
<div class="hxRow">
8585
{% for icon in data.icons %}

source/components/list/index.html

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
{% extends 'component.njk' %}
77
{% block content %}
88
<section>
9-
<header>
10-
<h2 id="unordered">Unordered</h2>
11-
</header>
9+
<h2 class="hxSectionTitle" id="unordered">Unordered</h2>
1210

1311
<!-- explanation goes here -->
1412

@@ -27,9 +25,7 @@ <h2 id="unordered">Unordered</h2>
2725
</section>
2826

2927
<section>
30-
<header>
31-
<h2 id="ordered">Ordered Lists</h2>
32-
</header>
28+
<h2 class="hxSectionTitle" id="ordered">Ordered Lists</h2>
3329

3430
<!-- explanation goes here -->
3531

@@ -48,9 +44,7 @@ <h2 id="ordered">Ordered Lists</h2>
4844
</section>
4945

5046
<section>
51-
<header>
52-
<h2 id="vertical-description">Vertical Description</h2>
53-
</header>
47+
<h2 class="hxSectionTitle" id="vertical-description">Vertical Description</h2>
5448

5549
<!-- explanation goes here -->
5650

@@ -69,9 +63,7 @@ <h2 id="vertical-description">Vertical Description</h2>
6963
</section>
7064

7165
<section>
72-
<header>
73-
<h2 id="horizontal-description">Horizontal Description</h2>
74-
</header>
66+
<h2 class="hxSectionTitle" id="horizontal-description">Horizontal Description</h2>
7567

7668
<!-- explanation goes here -->
7769

0 commit comments

Comments
 (0)