Skip to content

Tidy up Headlines CSS #662

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

Merged
merged 5 commits into from
Jan 17, 2022
Merged

Tidy up Headlines CSS #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
499f613
Tidy up About page HTML and CSS
palewire Jan 14, 2022
ea49b12
Cut cruft
palewire Jan 16, 2022
26f2d7c
Sure
palewire Jan 16, 2022
bcfe4d8
Merge branch 'master' of github.com:jupyter/jupyter.github.io
palewire Jan 17, 2022
542154c
Simplify headlines code
palewire Jan 17, 2022
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
100 changes: 13 additions & 87 deletions _sass/components/_headlines.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,96 +1,22 @@
// Formatting for headers and titles throughout the page.
h1,
h2,
h3,
h4,
h5,
h6 {
font-family: inherit;
@import "settings/fonts";

h1, h2, h3 {
font-family: $font-family-sans-serif;
font-weight: 500;
line-height: 1.1;
color: inherit;
}
h1,
h2,
h3 {
margin-top: 20px;
margin-bottom: 10px;
}
h4,
h5,
h6 {
margin-top: 10px;
margin-bottom: 10px;
line-height: 1.3;
margin-top: 2em;
margin-bottom: 0.33em;
}

h1 {
font-size: 36px;
}
h2 {
font-size: 30px;
}
h3 {
font-size: 24px;
}
h4 {
font-size: 18px;
}
h5 {
font-size: 14px;
}
h6 {
font-size: 12px;
font-size: 3.66rem;
}

@media (min-width: 992px) {
h4 {
font-size: 18px;
font-weight: 500;
line-height: 1.22;
}
h3 {
font-size: 28px;
font-weight: 500;
line-height: 1.25;
}
h2 {
font-size: 36px;
font-weight: 500;
line-height: 1.25;
}
h2 {
font-size: 2.66rem;
}

@media (max-width: 992px) {
h4 {
font-size: 18px;
font-weight: 500;
line-height: 1.11em;
}
h3 {
font-size: 22px;
font-weight: 500;
line-height: 1.136em;
}
h2 {
font-size: 26px;
font-weight: 500;
line-height: 1.153em;
}
h3 {
font-size: 2rem;
}

@media (max-width: 768px) {
h4 {
font-size: 18px;
font-weight: 500;
line-height: 1.11em;
}
h3 {
font-size: 22px;
font-weight: 500;
line-height: 1.136em;
}
h2 {
font-size: 26px;
font-weight: 500;
line-height: 1.153em;
}
}
2 changes: 0 additions & 2 deletions _sass/components/_homepage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
.description {
margin-top: 2em;
h2 {
font-size: 2em;
line-height: 1.4;
margin: 0;
@media (max-width: 420px) {
font-size: 1.8em;
Expand Down
2 changes: 2 additions & 0 deletions _sass/components/_jumbotron.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,6 @@
.jumbotron-text {
padding-bottom: 32px;
text-align: center;
font-size: 18px;
line-height: 1.3;
}
5 changes: 0 additions & 5 deletions _sass/components/_page-header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
background-color: $light-gray;
h1 {
margin: 0;
font-size: 2.5em;
line-height: 1.3;
@media (max-width: 767px) {
font-size: 2em;
}
}
img {
max-height: 200px;
Expand Down
1 change: 1 addition & 0 deletions _sass/settings/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
$font-family-sans-serif: "Myriad Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
$font-family-monospace: "SFMono-Regular", Menlo, Consolas, Monaco, Liberation Mono, Lucida Console, monospace;
20 changes: 10 additions & 10 deletions about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,12 +385,12 @@

<!-- DISTINGUISHED CONTRIBUTORS -->
<div class="content content--copy">
<h3 class="text-center">Distinguished Contributors</h3>
<h2 class="text-center">Distinguished Contributors</h2>
<p>{{ page.contributors_copy }}</p>
</div>

<div class="content content--wide">
<h4>2020 Cohort</h4>
<h3>2020 Cohort</h3>
<div class="biocard-wrapper">
{% for bio in page.distinguished_2020 %}
{% include biocard.html
Expand All @@ -405,7 +405,7 @@ <h4>2020 Cohort</h4>
{% endfor %}
</div>

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

<!-- STEERING COUNCIL -->
<div class="content content--copy">
<h3 class="text-center">Steering Council</h3>
<h2 class="text-center">Steering Council</h2>
<p>{{ page.steering_copy }}</p>
</div>
<div class="content content--wide">
Expand All @@ -447,7 +447,7 @@ <h3 class="text-center">Steering Council</h3>

<!-- NUMFOCUS MEMBERS -->
<div class="content content--copy">
<h3 class="text-center">NumFOCUS Subcommittee Members</h3>
<h2 class="text-center">NumFOCUS Subcommittee Members</h2>
</div>
<div class="content content--wide">
<div class="biocard-wrapper">
Expand All @@ -469,7 +469,7 @@ <h3 class="text-center">NumFOCUS Subcommittee Members</h3>

<!-- TRADEMARK MEMBERS -->
<div class="content content--copy">
<h3 class="text-center">Trademark Subcommittee Members</h3>
<h2 class="text-center">Trademark Subcommittee Members</h2>
</div>

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

<!-- RETIRED STEERING COUNCIL -->
<div class="content content--copy">
<h3 class="text-center">Retired Steering Council Members</h3>
<h2 class="text-center">Retired Steering Council Members</h2>
</div>

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

<!-- SPONSORS BOX -->
<div class="about-box section-grey content content--wide">
<h3 class="text-center">{{ page.sponsor_box.headline }}</h3>
<h2 class="text-center">{{ page.sponsor_box.headline }}</h2>
<p class="content content--copy text-center">
{{ page.sponsor_box.description }}
</p>
Expand All @@ -534,7 +534,7 @@ <h3 class="text-center">{{ page.sponsor_box.headline }}</h3>

<!-- PARTNERS BOX -->
<div class="about-box section-white content content--wide">
<h3 class="text-center">{{ page.partner_box.headline }}</h3>
<h2 class="text-center">{{ page.partner_box.headline }}</h2>
<p class="content content--copy text-center">
{{ page.partner_box.description }}
</p>
Expand All @@ -555,7 +555,7 @@ <h3 class="text-center">{{ page.partner_box.headline }}</h3>

<!-- DONATE BOX -->
<div class="about-box section-grey content content--wide">
<h3 class="text-center">{{ page.donate_box.headline }}</h3>
<h2 class="text-center">{{ page.donate_box.headline }}</h2>
{% for graf in page.donate_box.description %}
<p class="content content--copy">
{{ graf }}
Expand Down
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
<div class="container">
<div class="col-md-12">
<div class="col-md-8 col-md-offset-2">
<h4 class="jumbotron-text">{{ page.jumbotron.text }}</h4>
<div class="jumbotron-text">{{ page.jumbotron.text }}</div>
</div>
</div>
</div>
Expand Down