Skip to content
This repository has been archived by the owner on Feb 11, 2022. It is now read-only.

Commit

Permalink
fix: simpler h3 style
Browse files Browse the repository at this point in the history
Simplify style of H3 headings

fix #625
  • Loading branch information
Schalk Neethling committed May 12, 2021
1 parent 7d91ed5 commit 76384e9
Show file tree
Hide file tree
Showing 10 changed files with 64 additions and 138 deletions.
12 changes: 8 additions & 4 deletions sass/atoms/_typography.scss
Expand Up @@ -18,11 +18,18 @@

h1,
h2,
h3 {
h3,
h4,
h5 {
@include set-heading-font-family();
line-height: $heading-line-height;
}

h4,
h5 {
line-height: $heading-line-height;
}

h1 {
@include heading-1();
}
Expand All @@ -33,9 +40,6 @@ h2 {

h3 {
@include heading-3();
@include slab-highlight();

margin: $base-spacing 0;
}

h4 {
Expand Down
3 changes: 3 additions & 0 deletions styleguide/assets/atoms/_samples.scss
@@ -0,0 +1,3 @@
.sample {
margin: ($base-spacing * 2) 0;
}
138 changes: 8 additions & 130 deletions styleguide/assets/minimalist/main.css
Expand Up @@ -204,11 +204,18 @@ img {
}
h1,
h2,
h3 {
h3,
h4,
h5 {
font-family: zillaslab, palatino, "Palatino Linotype", serif;
line-height: 1.2;
}

h4,
h5 {
line-height: 1.2;
}

h1 {
font-size: 1.802rem;
}
Expand All @@ -229,13 +236,6 @@ h2 {

h3 {
font-size: 1.424rem;
background-color: #212121;
color: #fff;
font-family: zillaslab, palatino, "Palatino Linotype", serif;
font-weight: normal;
max-width: max-content;
padding: 0 6px;
margin: 24px 0;
}
@media all and (min-width: 47.9385em) {
h3 {
Expand Down Expand Up @@ -473,128 +473,6 @@ h4 .icon {
color: #276738;
}

.notecard {
border-left: 6px solid #1e7f9d;
margin: 0;
margin-bottom: 24px;
padding: 12px;
}
.notecard a:link, .notecard a:visited {
color: #212121;
text-decoration: underline;
}
.notecard a:hover, .notecard a:focus {
text-decoration: none;
}
.notecard h3,
.notecard h4 {
/*
* Because we also allow h3, we need to undo some of its styling here.
* This relates specifically to `background-color`, `color`,
* `padding` and `font-weight`
*/
background-color: inherit;
color: inherit;
display: inline-block;
font-family: arial, x-locale-body, sans-serif;
font-size: 1.125rem;
font-weight: bold;
margin: 0;
margin-bottom: 6px;
padding: 0;
}
@media all and (min-width: 47.9385em) {
.notecard h3,
.notecard h4 {
font-size: 1.25rem;
}
}
.notecard h3::before,
.notecard h4::before, .notecard.inline::before {
background-repeat: no-repeat;
background-size: 18px;
content: "";
display: inline-block;
height: 21px;
margin-right: 6px;
position: relative;
top: 2px;
width: 20px;
}
.notecard p {
margin-bottom: 12px;
}
.notecard p:last-child {
margin-bottom: 0;
}
.notecard.inline {
font-weight: normal;
margin: 6px;
padding: 3px 6px;
}
.notecard.inline::before {
top: 5px;
}
.notecard.inline p {
display: inline-block;
margin-bottom: 0;
}
.notecard.success {
background-color: #ebf8e1;
border-color: #367b48;
color: #212121;
}
.notecard.success h3::before,
.notecard.success h4::before, .notecard.success.inline::before {
background: transparent url(data:image/svg+xml;base64,PHN2ZyBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMCAxMDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgYXJpYS1oaWRkZW49InRydWUiIHJvbGU9ImltZyI+PHBhdGggZD0iTTk1IDI5YTUuNjMgNS42MyAwIDAxLTEuNjMgMy45NUw0My40NCA4Mi44NmE1LjYgNS42IDAgMDEtNy45IDBMNi42MyA1NGE1LjU5IDUuNTkgMCAwMTAtNy44OWw3Ljg5LTcuOWE1LjYgNS42IDAgMDE3LjkgMGwxNy4wNyAxNy4wOCAzOC4wOS0zOC4xNWE1LjU5IDUuNTkgMCAwMTcuODkgMGw3LjkgNy44NkE1LjY3IDUuNjcgMCAwMTk1IDI5eiIgZmlsbD0iY3VycmVudENvbG9yIi8+PC9zdmc+Cg==) 0 0 no-repeat;
}
.notecard.note {
background-color: #dcf4ff;
}
.notecard.note h3::before,
.notecard.note h4::before, .notecard.note.inline::before {
background: transparent url(data:image/svg+xml;base64,PHN2ZyBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMCAxMDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgYXJpYS1oaWRkZW49InRydWUiIHJvbGU9ImltZyI+PHBhdGggZD0iTTYyLjg2IDMwLjcxVjdhMTAuMTcgMTAuMTcgMCAwMTEuOCAxLjQxbDIwLjQ5IDIwLjVhMTAuMjMgMTAuMjMgMCAwMTEuNDEgMS44em0tNi40MyAxLjYxYTQuODIgNC44MiAwIDAwNC44MiA0LjgyaDI3LjMydjUzQTQuODIgNC44MiAwIDAxODMuNzUgOTVoLTY3LjVhNC44MiA0LjgyIDAgMDEtNC44Mi00LjgyVjkuODJBNC44MiA0LjgyIDAgMDExNi4yNSA1aDQwLjE4eiIgZmlsbD0iY3VycmVudENvbG9yIi8+PC9zdmc+Cg==) 0 0 no-repeat;
}
.notecard.warning, .notecard.experimental, .notecard.draft, .notecard.secure {
background-color: #fef1b6;
border-color: #e1c542;
color: #212121;
}
.notecard.warning h3::before,
.notecard.warning h4::before, .notecard.warning.inline::before, .notecard.experimental h3::before,
.notecard.experimental h4::before, .notecard.experimental.inline::before, .notecard.draft h3::before,
.notecard.draft h4::before, .notecard.draft.inline::before, .notecard.secure h3::before,
.notecard.secure h4::before, .notecard.secure.inline::before {
background: transparent url(data:image/svg+xml;base64,PHN2ZyBjbGFzcz0iaWNvbiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCIgcm9sZT0iaW1nIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6Y3VycmVudENvbG9yO308L3N0eWxlPjwvZGVmcz48ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIj48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik05Ni42LDgyLjEsNzYuMTYsNDYuNyw1NS43MiwxMS4yOWE2LjYxLDYuNjEsMCwwLDAtMTEuNDQsMEwyMy44NCw0Ni43LDMuNCw4Mi4xQTYuNiw2LjYsMCwwLDAsOS4xMiw5Mkg5MC44OEE2LjYsNi42LDAsMCwwLDk2LjYsODIuMVpNNTAsODYuMzJBNi4zMyw2LjMzLDAsMSwxLDU2LjMzLDgwLDYuMzQsNi4zNCwwLDAsMSw1MCw4Ni4zMlptMC0xN1MzOS45Miw0Mi40NSwzOS45MiwzNS45MSw0NC40MywyNC4wOCw1MCwyNC4wOHMxMC4wOCw1LjMsMTAuMDgsMTEuODNTNTAsNjkuMzEsNTAsNjkuMzFaIi8+PC9nPjwvc3ZnPgo=) 0 0 no-repeat;
}
.notecard.experimental h3::before,
.notecard.experimental h4::before {
background-image: url(data:image/svg+xml;base64,PHN2ZyBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMCAxMDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgYXJpYS1oaWRkZW49InRydWUiIHJvbGU9ImltZyI+PHBhdGggZD0iTTkwLjcyIDgyLjM0YzQuNCA3IDEuMjkgMTIuNjYtNyAxMi42NkgxNi4yNUM4IDk1IDQuODggODkuMzEgOS4yOCA4Mi4zNGwyOS40Ny00Ni40NlYxMi41SDM1QTMuNzUgMy43NSAwIDAxMzUgNWgzMGEzLjc1IDMuNzUgMCAwMTAgNy41aC0zLjc1djIzLjM4ek00NS4wOCAzOS44NkwyOS4xNCA2NWg0MS43Mkw1NC45MiAzOS44NmwtMS4xNy0xLjgxVjEyLjVoLTcuNXYyNS41NXoiIGZpbGw9ImN1cnJlbnRDb2xvciIvPjwvc3ZnPgo=);
}
.notecard.draft h3::before,
.notecard.draft h4::before {
background-image: url(data:image/svg+xml;base64,PHN2ZyBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMCAxMDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgYXJpYS1oaWRkZW49InRydWUiIHJvbGU9ImltZyI+PHBhdGggZD0iTTI2LjU2IDg3LjRMMzIgODIgMTggNjhsLTUuNCA1LjQ0djYuMzVoNy42MXY3LjYxem0zMS4wNy01NS4xM0ExLjI1IDEuMjUgMCAwMDU2LjQ0IDMxaC0uMTFhMS40IDEuNCAwIDAwLTEgLjQxbC0zMi4yIDMyLjJhMS40MiAxLjQyIDAgMDAtLjQyIDFBMS4yNSAxLjI1IDAgMDAyNCA2NS44OWExLjM3IDEuMzcgMCAwMDEtLjQxbDMyLjItMzIuMmExLjM3IDEuMzcgMCAwMC40My0xLjAxem0tMy4yLTExLjQxbDI0LjcxIDI0LjcxTDI5LjcxIDk1SDVWNzAuMjl6TTk1IDI2LjU2YTcuNjMgNy42MyAwIDAxLTIuMiA1LjM1bC05Ljg2IDkuODYtMjQuNzEtMjQuNzEgOS44Ni05LjhBNy40NCA3LjQ0IDAgMDE3My40NCA1YTcuNjcgNy42NyAwIDAxNS40IDIuMjZsMTQgMTMuOWE3Ljg4IDcuODggMCAwMTIuMTYgNS40eiIgZmlsbD0iY3VycmVudENvbG9yIi8+PC9zdmc+Cg==);
}
.notecard.secure h3::before,
.notecard.secure h4::before {
background-image: url(data:image/svg+xml;base64,PHN2ZyBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMCAxMDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgYXJpYS1oaWRkZW49InRydWUiIHJvbGU9ImltZyI+PHBhdGggZD0iTTMzLjY0IDQ1LjkxaDMyLjcyVjMzLjY0YTE2LjM2IDE2LjM2IDAgMTAtMzIuNzIgMHptNTMuMTggNi4xNHYzNi44MUE2LjE0IDYuMTQgMCAwMTgwLjY4IDk1SDE5LjMyYTYuMTQgNi4xNCAwIDAxLTYuMTQtNi4xNFY1Mi4wNWE2LjE0IDYuMTQgMCAwMTYuMTQtNi4xNGgyVjMzLjY0YTI4LjY0IDI4LjY0IDAgMTE1Ny4yOCAwdjEyLjI3aDJhNi4xNCA2LjE0IDAgMDE2LjIyIDYuMTR6IiBmaWxsPSJjdXJyZW50Q29sb3IiLz48L3N2Zz4K);
}
.notecard.negative, .notecard.obsolete, .notecard.deprecated {
background-color: #ffbdbd;
border-color: #d0454c;
color: #212121;
}
.notecard.negative h3::before,
.notecard.negative h4::before, .notecard.negative.inline::before, .notecard.obsolete h3::before,
.notecard.obsolete h4::before, .notecard.obsolete.inline::before, .notecard.deprecated h3::before,
.notecard.deprecated h4::before, .notecard.deprecated.inline::before {
background: transparent url(data:image/svg+xml;base64,PHN2ZyBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMCAxMDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgYXJpYS1oaWRkZW49InRydWUiIHJvbGU9ImltZyI+PHBhdGggZD0iTTM4Ljc1IDc4LjEzVjM2Ljg4QTEuODUgMS44NSAwIDAwMzYuODggMzVoLTMuNzVhMS44NSAxLjg1IDAgMDAtMS44OCAxLjg4djQxLjI1QTEuODUgMS44NSAwIDAwMzMuMTMgODBoMy43NWExLjg1IDEuODUgMCAwMDEuODctMS44N3ptMTUgMFYzNi44OEExLjg1IDEuODUgMCAwMDUxLjg4IDM1aC0zLjc1YTEuODUgMS44NSAwIDAwLTEuODggMS44OHY0MS4yNUExLjg1IDEuODUgMCAwMDQ4LjEzIDgwaDMuNzVhMS44NSAxLjg1IDAgMDAxLjg3LTEuODd6bTE1IDBWMzYuODhBMS44NSAxLjg1IDAgMDA2Ni44OCAzNWgtMy43NWExLjg1IDEuODUgMCAwMC0xLjg4IDEuODh2NDEuMjVBMS44NSAxLjg1IDAgMDA2My4xMyA4MGgzLjc1YTEuODUgMS44NSAwIDAwMS44Ny0xLjg3ek0zNi44OCAyMGgyNi4yNWwtMi44Mi02Ljg1YTIuMzUgMi4zNSAwIDAwLTEtLjY1SDQwLjc0YTIgMiAwIDAwLTEgLjY1em01NC4zNyAxLjg4djMuNzVhMS44NSAxLjg1IDAgMDEtMS44NyAxLjg3aC01LjYzdjU1LjU1YzAgNi40NC00LjIyIDEyLTkuMzcgMTJIMjUuNjNjLTUuMTYgMC05LjM4LTUuMjctOS4zOC0xMS43MlYyNy41aC01LjYyYTEuODUgMS44NSAwIDAxLTEuODgtMS44M3YtMy44QTEuODUgMS44NSAwIDAxMTAuNjMgMjBoMTguMWw0LjEtOS43OEE5LjEyIDkuMTIgMCAwMTQwLjYzIDVoMTguNzVhOS4xIDkuMSAwIDAxNy43OSA1LjIybDQuMSA5Ljc4aDE4LjExYTEuODUgMS44NSAwIDAxMS44NyAxLjg3eiIgZmlsbD0iY3VycmVudENvbG9yIi8+PC9zdmc+Cg==) 0 0 no-repeat;
}
.notecard.deprecated h3::before,
.notecard.deprecated h4::before {
background-image: url(data:image/svg+xml;base64,PHN2ZyBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMCAxMDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgYXJpYS1oaWRkZW49InRydWUiIHJvbGU9ImltZyI+PHBhdGggZD0iTTE5LjQgMjQuOGEzLjYgMy42IDAgMTEtNy4yIDAgMy42IDMuNiAwIDExNy4yIDB6bTkgMjguOHYtMzZhMy42MiAzLjYyIDAgMDAtMy42LTMuNkg4LjZBMy42MiAzLjYyIDAgMDA1IDE3LjZ2MzZhMy42MiAzLjYyIDAgMDAzLjYgMy42aDE2LjJhMy42MiAzLjYyIDAgMDAzLjYtMy42em02My41MS04LjM4QTEzLjE2IDEzLjE2IDAgMDE5NSA1My42YTExIDExIDAgMDEtMTAuOCAxMC44SDY4LjYyYTEzLjQ3IDEzLjQ3IDAgMDAxLjYzIDMuNmMxLjQ2IDIuOTIgMy4xNSA2LjE5IDMuMTUgMTAuOCAwIDQuMzMgMCAxNC40LTEyLjYgMTQuNGEzLjU0IDMuNTQgMCAwMS0yLjUzLTEuMDdjLTIuNDItMi4zNi0zLjEtNS44NS0zLjcxLTkuMTdzLTEuMy02LjY0LTMuNDktOC44M2E3NS44NCA3NS44NCAwIDAxLTUuNjgtNi43NWMtMi40OC0zLjI2LTcuODgtMTAtMTAtMTAuMTJhMy43NiAzLjc2IDAgMDEtMy4zOS0zLjZWMTcuNmEzLjcxIDMuNzEgMCAwMTMuNi0zLjZjMi0uMDYgNS4zNC0xLjI0IDguODktMi40N0M1MC41NiA5LjQ0IDU4LjE2IDYuOCA2Ni4yIDYuOGg3LjI2YzUgLjA2IDguNjYgMS41MiAxMS4wOCA0LjM5IDIuMTMgMi41MyAzLjA5IDYgMi43NSAxMC4xOGExMS40NyAxMS40NyAwIDAxMyA1LjI5IDExLjg3IDExLjg3IDAgMDEwIDYuNTggMTEuODcgMTEuODcgMCAwMTIuNDIgNy43IDE1LjIgMTUuMiAwIDAxLS44NCA0LjI4eiIgZmlsbD0iY3VycmVudENvbG9yIi8+PC9zdmc+Cg==);
}

/* General Badges */
.badge {
background-color: #fafafa;
Expand Down
1 change: 1 addition & 0 deletions styleguide/assets/styleguide.scss
Expand Up @@ -5,6 +5,7 @@
@import "./utils/layout";

@import "./atoms/logo";
@import "./atoms/samples";
@import "./atoms/tables";

@import "./molecules/button-gallery";
Expand Down
37 changes: 37 additions & 0 deletions styleguide/content/typography/_index.md
@@ -0,0 +1,37 @@
---
title: Typography - MDN Minimalist
keywords: typography, font, type, mdn minimalist, mdn, sass, library
description: The MDN Web Docs typography styles
---

# Typography

Below is the default styling for headings level 1-5 with their default margins. There are no special class names to use. Font sizes will also decrease appropriately on mobile devices but still follow a defined typescale.

# Heading Level 1

## Heading Level 2

### Heading Level 3

#### Heading Level 4

##### Heading Level 5

## The Typescale

Desktop and tablet typescale is based on [major third typescale](https://type-scale.com/?size=16&scale=1.250&text=MDN%20Web%20Docs&font=Poppins&fontweight=400&bodyfont=body_font_default&bodyfontweight=400&lineheight=1.75&backgroundcolor=%23ffffff&fontcolor=%23000000&preview=false) with a base of 100% of base font size set by the user which is typically 16-18px. On mobile phones the typescale based is based on a [major second typescale](https://bit.ly/2VUrOJm) with a base of 100% as set by the user.

## ZillaSlab highlight

Any heading level can be set to use the ZillaSlab Highlight style by adding the class `slab-highlight`, for example:

<div class="sample">
<h2 class="slab-highlight">Slab Highlighted</h2>
</div>

### Code example

```html
<h2 class="slab-highlight">Slab Highlighted</h2>
```
3 changes: 3 additions & 0 deletions styleguide/layouts/partials/main-nav.html
Expand Up @@ -17,4 +17,7 @@
<li>
<a href="/tables/">Tables</a>
</li>
<li>
<a href="/typography/">Typography</a>
</li>
</ul>

Large diffs are not rendered by default.

@@ -1 +1 @@
{"Target":"minimalist/main.min.3a60ccafcd3ff553f7fedfd405e9e83293584b5e94a2e5bae3841b041c6484fc.css","MediaType":"text/css","Data":{"Integrity":"sha256-OmDMr80/9VP3/t/UBenoMpNYS16UouW644QbBBxkhPw="}}
{"Target":"minimalist/main.min.4c888e8bc6dd52ffcd00da6e28efb6a6d0951376c792d9e5fe5b3e976108a94e.css","MediaType":"text/css","Data":{"Integrity":"sha256-TIiOi8bdUv/NANpuKO+2ptCVE3bHktnl/ls+l2EIqU4="}}

0 comments on commit 76384e9

Please sign in to comment.