Skip to content

Commit 6270c77

Browse files
committed
Added Adobe fonts and set override variables in place for body and headings
1 parent ce948fc commit 6270c77

File tree

3 files changed

+29
-10
lines changed

3 files changed

+29
-10
lines changed
Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,39 @@
1+
// Override fonts from the theme gem, done temporarily for USE UI
2+
body {
3+
font-family: $base-font;
4+
}
5+
6+
h1, h2, h3, h4, h5, h6 {
7+
font-family: $heading-font;
8+
font-weight: $fw-semibold;
9+
}
10+
111
.hd-1 {
212
font-size: $fs-xxxxlarge;
3-
font-weight: $fw-bold;
4-
line-height: $lh-xtight;
13+
font-weight: $fw-semibold;
14+
line-height: $lh-base;
515
}
616

717
.hd-2 {
818
font-size: $fs-xxlarge;
9-
font-weight: $fw-bold;
10-
line-height: $lh-xtight;
19+
font-weight: $fw-semibold;
20+
line-height: $lh-base;
1121
}
1222

1323
.hd-3 {
1424
font-size: $fs-xlarge;
15-
font-weight: $fw-bold;
16-
line-height: $lh-xtight;
25+
font-weight: $fw-semibold;
26+
line-height: $lh-base;
1727
}
1828

1929
.hd-4 {
20-
line-height: $lh-xtight;
30+
line-height: $lh-base;
2131
}
2232

2333
.hd-5 {
24-
line-height: $lh-xtight;
34+
line-height: $lh-base;
2535
}
2636

2737
.hd-6 {
28-
line-height: $lh-xtight;
38+
line-height: $lh-base;
2939
}

app/assets/stylesheets/partials/_variables.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
// #TYPOGRAPHY
33
// ----------------------------
44

5+
// Font family definitions
6+
$base-font: neue-haas-grotesk-text, "Helvetica Neue", Helvetica, Arial, sans-serif;
7+
$heading-font: neue-haas-grotesk-display, "Helvetica Neue", Helvetica, Arial, sans-serif;
8+
59
// Font sizes, weights, and line heights
610
// 1 rem is 10 px...
711
$fs-base: 1.6rem; // Pentagram originally specified 1.4
@@ -11,7 +15,12 @@ $fs-xxxlarge: 4.2rem; // unused by default
1115
$fs-xxxxlarge: 5.2rem;
1216

1317
$fw-normal: 400;
18+
$fw-semibold: 600;
1419
$fw-bold: 700;
1520

1621
$lh-xtight: .92;
22+
$lh-tight: 1.1;
1723
$lh-base: 1.2;
24+
$lh-loose: 1.35;
25+
$lh-xloose: 1.5;
26+
$lh-xxloose: 1.6;

app/views/layouts/_head.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js" type="text/javascript"></script>
1313
<![endif]-->
1414
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/4.1.1/normalize.min.css">
15-
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic&subset=latin,latin-ext" type="text/css">
15+
<%= stylesheet_link_tag 'https://use.typekit.net/ixd2vgq.css' %>
1616
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbo-track': 'reload' %>
1717

1818
<!-- For all other devices -->

0 commit comments

Comments
 (0)