Skip to content

Commit 596021a

Browse files
authored
Added font family and heading styles (#1012)
1 parent 52a122f commit 596021a

File tree

4 files changed

+54
-7
lines changed

4 files changed

+54
-7
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
h1, h2, h3, h4, h5, h6 {
2+
font-weight: 600;
3+
}
4+
5+
h1 {
6+
font-size: 2.5rem;
7+
}
8+
9+
h2 {
10+
font-size: 2.0rem;
11+
}
12+
13+
h3 {
14+
font-size: 1.75rem;
15+
}
16+
17+
h4 {
18+
font-size: 1.5rem;
19+
}
20+
21+
h5 {
22+
font-size: 1.25rem;
23+
}
24+
25+
h6 {
26+
font-size: 1rem;
27+
}

app/assets/stylesheets/_variables.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import url(https://fonts.googleapis.com/css2?family=Libre+Franklin:ital,wght@0,100..900;1,100..900&display=swap);
2+
13
$princeton-orange: #E77500;
24
$princeton-orange-80: #EC9133;
35
$princeton-orange-20: #FAE3CC;
@@ -11,6 +13,7 @@ $gray-60: #717171;
1113
$gray-20: #D0D0D0;
1214
$gray-10: #EEEEEE;
1315
$white: #FFFFFF;
16+
$black: #000000;
1417

1518
$green-dark: #006450;
1619
$red-dark: #B00002;
@@ -21,4 +24,6 @@ $light-blue: #BED8E2;
2124
$status-success: #DDEDE6;
2225
$status-error: #F3D9D9;
2326
$status-warning: #FFF6DF;
24-
$status-info: #E6EEF8;
27+
$status-info: #E6EEF8;
28+
29+
$libre-franklin: "Libre Franklin", sans-serif;

app/assets/stylesheets/application.scss

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,21 @@
1111
* It is generally better to create a new file per style scope.
1212
*/
1313

14-
@import "settings";
14+
@import "bootstrap";
15+
16+
@import "alternate_mediaflux";
1517
@import "banner";
18+
@import "components/mediaflux_status";
1619
@import "emulator";
17-
@import "alternate_mediaflux";
18-
@import "header";
1920
@import "footer";
20-
@import "components/mediaflux_status";
21-
@import "variables";
21+
@import "header";
22+
@import "settings";
2223
@import "styles_preview";
24+
@import "typography";
25+
@import "variables";
2326

24-
@import "bootstrap";
27+
body {
28+
font-family: $libre-franklin;
29+
color: $black;
30+
}
2531

app/views/welcome/styles_preview.html.erb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
<p>This page shows the styles that have been implemented for this site's look and feel.</p>
44

5+
<h1>Heading Level 1</h1>
6+
<h2>Heading Level 2</h2>
7+
<h3>Heading Level 3</h3>
8+
<h4>Heading Level 4</h4>
9+
<h5>Heading Level 5</h5>
10+
<h6>Heading Level 6</h6>
11+
512
<h2>Colors</h2>
613

714
<div class="colors-section">
@@ -40,3 +47,5 @@
4047

4148

4249

50+
51+

0 commit comments

Comments
 (0)