Skip to content

Commit 0454922

Browse files
palewirepalewire
authoredJan 17, 2022
Tidy up Headlines CSS (#662)
1 parent 48bfcbc commit 0454922

File tree

7 files changed

+27
-105
lines changed

7 files changed

+27
-105
lines changed
 

‎_sass/components/_headlines.scss

+13-87
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,22 @@
1-
// Formatting for headers and titles throughout the page.
2-
h1,
3-
h2,
4-
h3,
5-
h4,
6-
h5,
7-
h6 {
8-
font-family: inherit;
1+
@import "settings/fonts";
2+
3+
h1, h2, h3 {
4+
font-family: $font-family-sans-serif;
95
font-weight: 500;
10-
line-height: 1.1;
11-
color: inherit;
12-
}
13-
h1,
14-
h2,
15-
h3 {
16-
margin-top: 20px;
17-
margin-bottom: 10px;
18-
}
19-
h4,
20-
h5,
21-
h6 {
22-
margin-top: 10px;
23-
margin-bottom: 10px;
6+
line-height: 1.3;
7+
margin-top: 2em;
8+
margin-bottom: 0.33em;
249
}
10+
2511
h1 {
26-
font-size: 36px;
27-
}
28-
h2 {
29-
font-size: 30px;
30-
}
31-
h3 {
32-
font-size: 24px;
33-
}
34-
h4 {
35-
font-size: 18px;
36-
}
37-
h5 {
38-
font-size: 14px;
39-
}
40-
h6 {
41-
font-size: 12px;
12+
font-size: 3.66rem;
4213
}
4314

44-
@media (min-width: 992px) {
45-
h4 {
46-
font-size: 18px;
47-
font-weight: 500;
48-
line-height: 1.22;
49-
}
50-
h3 {
51-
font-size: 28px;
52-
font-weight: 500;
53-
line-height: 1.25;
54-
}
55-
h2 {
56-
font-size: 36px;
57-
font-weight: 500;
58-
line-height: 1.25;
59-
}
15+
h2 {
16+
font-size: 2.66rem;
6017
}
6118

62-
@media (max-width: 992px) {
63-
h4 {
64-
font-size: 18px;
65-
font-weight: 500;
66-
line-height: 1.11em;
67-
}
68-
h3 {
69-
font-size: 22px;
70-
font-weight: 500;
71-
line-height: 1.136em;
72-
}
73-
h2 {
74-
font-size: 26px;
75-
font-weight: 500;
76-
line-height: 1.153em;
77-
}
19+
h3 {
20+
font-size: 2rem;
7821
}
7922

80-
@media (max-width: 768px) {
81-
h4 {
82-
font-size: 18px;
83-
font-weight: 500;
84-
line-height: 1.11em;
85-
}
86-
h3 {
87-
font-size: 22px;
88-
font-weight: 500;
89-
line-height: 1.136em;
90-
}
91-
h2 {
92-
font-size: 26px;
93-
font-weight: 500;
94-
line-height: 1.153em;
95-
}
96-
}

‎_sass/components/_homepage.scss

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
.description {
1414
margin-top: 2em;
1515
h2 {
16-
font-size: 2em;
17-
line-height: 1.4;
1816
margin: 0;
1917
@media (max-width: 420px) {
2018
font-size: 1.8em;

‎_sass/components/_jumbotron.scss

+2
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,6 @@
6363
.jumbotron-text {
6464
padding-bottom: 32px;
6565
text-align: center;
66+
font-size: 18px;
67+
line-height: 1.3;
6668
}

‎_sass/components/_page-header.scss

-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
background-color: $light-gray;
88
h1 {
99
margin: 0;
10-
font-size: 2.5em;
11-
line-height: 1.3;
12-
@media (max-width: 767px) {
13-
font-size: 2em;
14-
}
1510
}
1611
img {
1712
max-height: 200px;

‎_sass/settings/_fonts.scss

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
$font-family-sans-serif: "Myriad Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
12
$font-family-monospace: "SFMono-Regular", Menlo, Consolas, Monaco, Liberation Mono, Lucida Console, monospace;

‎about.html

+10-10
Original file line numberDiff line numberDiff line change
@@ -385,12 +385,12 @@
385385

386386
<!-- DISTINGUISHED CONTRIBUTORS -->
387387
<div class="content content--copy">
388-
<h3 class="text-center">Distinguished Contributors</h3>
388+
<h2 class="text-center">Distinguished Contributors</h2>
389389
<p>{{ page.contributors_copy }}</p>
390390
</div>
391391

392392
<div class="content content--wide">
393-
<h4>2020 Cohort</h4>
393+
<h3>2020 Cohort</h3>
394394
<div class="biocard-wrapper">
395395
{% for bio in page.distinguished_2020 %}
396396
{% include biocard.html
@@ -405,7 +405,7 @@ <h4>2020 Cohort</h4>
405405
{% endfor %}
406406
</div>
407407

408-
<h4>Special Election Cohort</h4>
408+
<h3>Special Election Cohort</h3>
409409
<div class="biocard-wrapper">
410410
{% for bio in page.distinguished_special_election %}
411411
{% include biocard.html
@@ -424,7 +424,7 @@ <h4>Special Election Cohort</h4>
424424

425425
<!-- STEERING COUNCIL -->
426426
<div class="content content--copy">
427-
<h3 class="text-center">Steering Council</h3>
427+
<h2 class="text-center">Steering Council</h2>
428428
<p>{{ page.steering_copy }}</p>
429429
</div>
430430
<div class="content content--wide">
@@ -447,7 +447,7 @@ <h3 class="text-center">Steering Council</h3>
447447

448448
<!-- NUMFOCUS MEMBERS -->
449449
<div class="content content--copy">
450-
<h3 class="text-center">NumFOCUS Subcommittee Members</h3>
450+
<h2 class="text-center">NumFOCUS Subcommittee Members</h2>
451451
</div>
452452
<div class="content content--wide">
453453
<div class="biocard-wrapper">
@@ -469,7 +469,7 @@ <h3 class="text-center">NumFOCUS Subcommittee Members</h3>
469469

470470
<!-- TRADEMARK MEMBERS -->
471471
<div class="content content--copy">
472-
<h3 class="text-center">Trademark Subcommittee Members</h3>
472+
<h2 class="text-center">Trademark Subcommittee Members</h2>
473473
</div>
474474

475475
<div class="content content--wide">
@@ -492,7 +492,7 @@ <h3 class="text-center">Trademark Subcommittee Members</h3>
492492

493493
<!-- RETIRED STEERING COUNCIL -->
494494
<div class="content content--copy">
495-
<h3 class="text-center">Retired Steering Council Members</h3>
495+
<h2 class="text-center">Retired Steering Council Members</h2>
496496
</div>
497497

498498
<div class="content content--wide">
@@ -513,7 +513,7 @@ <h3 class="text-center">Retired Steering Council Members</h3>
513513

514514
<!-- SPONSORS BOX -->
515515
<div class="about-box section-grey content content--wide">
516-
<h3 class="text-center">{{ page.sponsor_box.headline }}</h3>
516+
<h2 class="text-center">{{ page.sponsor_box.headline }}</h2>
517517
<p class="content content--copy text-center">
518518
{{ page.sponsor_box.description }}
519519
</p>
@@ -534,7 +534,7 @@ <h3 class="text-center">{{ page.sponsor_box.headline }}</h3>
534534

535535
<!-- PARTNERS BOX -->
536536
<div class="about-box section-white content content--wide">
537-
<h3 class="text-center">{{ page.partner_box.headline }}</h3>
537+
<h2 class="text-center">{{ page.partner_box.headline }}</h2>
538538
<p class="content content--copy text-center">
539539
{{ page.partner_box.description }}
540540
</p>
@@ -555,7 +555,7 @@ <h3 class="text-center">{{ page.partner_box.headline }}</h3>
555555

556556
<!-- DONATE BOX -->
557557
<div class="about-box section-grey content content--wide">
558-
<h3 class="text-center">{{ page.donate_box.headline }}</h3>
558+
<h2 class="text-center">{{ page.donate_box.headline }}</h2>
559559
{% for graf in page.donate_box.description %}
560560
<p class="content content--copy">
561561
{{ graf }}

‎index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@
271271
<div class="container">
272272
<div class="col-md-12">
273273
<div class="col-md-8 col-md-offset-2">
274-
<h4 class="jumbotron-text">{{ page.jumbotron.text }}</h4>
274+
<div class="jumbotron-text">{{ page.jumbotron.text }}</div>
275275
</div>
276276
</div>
277277
</div>

0 commit comments

Comments
 (0)
Please sign in to comment.