Skip to content
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

Jump to bottom

Add numbered header margins and line heights #8

Merged
merged 2 commits into from
Dec 6, 2017
Merged

Add numbered header margins and line heights #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96e64d0
Add h1-h6 top and bottom margin variables (fix #1).
Dec 6, 2017
a98d4b6
Add h1-h6 line-height variables.
Dec 6, 2017
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
36 changes: 36 additions & 0 deletions styles/components/elements/_headings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,55 +19,73 @@
}

h1 {
margin-top: $h1-margin-top;
margin-bottom: $h1-margin-bottom;
font-family: $h1-font-family;
font-size: if-map-get($h1-font-size, $type);
font-style: $h1-font-style;
font-weight: $h1-font-weight;
line-height: $h1-line-height;
text-align: $h1-align;
text-transform: $h1-text-transform;
}

h2 {
margin-top: $h2-margin-top;
margin-bottom: $h2-margin-bottom;
font-family: $h2-font-family;
font-size: if-map-get($h2-font-size, $type);
font-style: $h2-font-style;
font-weight: $h2-font-weight;
line-height: $h2-line-height;
text-align: $h2-align;
text-transform: $h2-text-transform;
}

h3 {
margin-top: $h3-margin-top;
margin-bottom: $h3-margin-bottom;
font-family: $h3-font-family;
font-size: if-map-get($h3-font-size, $type);
font-style: $h3-font-style;
font-weight: $h3-font-weight;
line-height: $h3-line-height;
text-align: $h3-align;
text-transform: $h3-text-transform;
}

h4 {
margin-top: $h4-margin-top;
margin-bottom: $h4-margin-bottom;
font-family: $h4-font-family;
font-size: if-map-get($h4-font-size, $type);
font-style: $h4-font-style;
font-weight: $h4-font-weight;
line-height: $h4-line-height;
text-align: $h4-align;
text-transform: $h4-text-transform;
}

h5 {
margin-top: $h5-margin-top;
margin-bottom: $h5-margin-bottom;
font-family: $h5-font-family;
font-size: if-map-get($h5-font-size, $type);
font-style: $h5-font-style;
font-weight: $h5-font-weight;
line-height: $h5-line-height;
text-align: $h5-align;
text-transform: $h5-text-transform;
}

h6 {
margin-top: $h6-margin-top;
margin-bottom: $h6-margin-bottom;
font-family: $h6-font-family;
font-size: if-map-get($h6-font-size, $type);
font-style: $h6-font-style;
font-weight: $h6-font-weight;
line-height: $h6-line-height;
text-align: $h6-align;
text-transform: $h6-text-transform;
}
Expand Down Expand Up @@ -164,55 +182,73 @@
}

h1 {
margin-top: $h1-margin-top;
margin-bottom: $h1-margin-bottom;
font-family: $h1-font-family;
font-size: if-map-get($h1-font-size, $type);
font-style: $h1-font-style;
font-weight: $h1-font-weight;
line-height: $h1-line-height;
text-align: $h1-align;
text-transform: $h1-text-transform;
}

h2 {
margin-top: $h2-margin-top;
margin-bottom: $h2-margin-bottom;
font-family: $h2-font-family;
font-size: if-map-get($h2-font-size, $type);
font-style: $h2-font-style;
font-weight: $h2-font-weight;
line-height: $h2-line-height;
text-align: $h2-align;
text-transform: $h2-text-transform;
}

h3 {
margin-top: $h3-margin-top;
margin-bottom: $h3-margin-bottom;
font-family: $h3-font-family;
font-size: if-map-get($h3-font-size, $type);
font-style: $h3-font-style;
font-weight: $h3-font-weight;
line-height: $h3-line-height;
text-align: $h3-align;
text-transform: $h3-text-transform;
}

h4 {
margin-top: $h4-margin-top;
margin-bottom: $h4-margin-bottom;
font-family: $h4-font-family;
font-size: if-map-get($h4-font-size, $type);
font-style: $h4-font-style;
font-weight: $h4-font-weight;
line-height: $h4-line-height;
text-align: $h4-align;
text-transform: $h4-text-transform;
}

h5 {
margin-top: $h5-margin-top;
margin-bottom: $h5-margin-bottom;
font-family: $h5-font-family;
font-size: if-map-get($h5-font-size, $type);
font-style: $h5-font-style;
font-weight: $h5-font-weight;
line-height: $h5-line-height;
text-align: $h5-align;
text-transform: $h5-text-transform;
}

h6 {
margin-top: $h6-margin-top;
margin-bottom: $h6-margin-bottom;
font-family: $h6-font-family;
font-size: if-map-get($h6-font-size, $type);
font-style: $h6-font-style;
font-weight: $h6-font-weight;
line-height: $h6-line-height;
text-align: $h6-align;
text-transform: $h6-text-transform;
}
Expand Down
18 changes: 18 additions & 0 deletions styles/variables/_elements.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,50 +22,68 @@ $hx-margin-bottom: 1em !default;
$hx-line-height: 1.5em !default;

// Heading 1
$h1-margin-top: $hx-margin-top !default;
$h1-margin-bottom: $hx-margin-bottom !default;
$h1-font-family: $font-3 !default;
$h1-font-size: 1em !default;
$h1-font-style: normal !default;
$h1-font-weight: bold !default;
$h1-line-height: $hx-line-height !default;
$h1-text-transform: uppercase !default;
$h1-align: center !default;

// Heading 2
$h2-margin-top: $hx-margin-top !default;
$h2-margin-bottom: $hx-margin-bottom !default;
$h2-font-family: $font-3 !default;
$h2-font-size: 1em !default;
$h2-font-style: normal !default;
$h2-font-weight: normal !default;
$h2-line-height: $hx-line-height !default;
$h2-text-transform: uppercase !default;
$h2-align: center !default;

// Heading 3
$h3-margin-top: $hx-margin-top !default;
$h3-margin-bottom: $hx-margin-bottom !default;
$h3-font-family: $font-3 !default;
$h3-font-size: 1em !default;
$h3-font-style: normal !default;
$h3-font-weight: bold !default;
$h3-line-height: $hx-line-height !default;
$h3-text-transform: none !default;
$h3-align: center !default;

// Heading 4
$h4-margin-top: $hx-margin-top !default;
$h4-margin-bottom: $hx-margin-bottom !default;
$h4-font-family: $font-3 !default;
$h4-font-size: 1em !default;
$h4-font-style: normal !default;
$h4-font-weight: bold !default;
$h4-line-height: $hx-line-height !default;
$h4-text-transform: none !default;
$h4-align: center !default;

// Heading 5
$h5-margin-top: $hx-margin-top !default;
$h5-margin-bottom: $hx-margin-bottom !default;
$h5-font-family: $font-3 !default;
$h5-font-size: 1em !default;
$h5-font-style: italic !default;
$h5-font-weight: normal !default;
$h5-line-height: $hx-line-height !default;
$h5-text-transform: none !default;
$h5-align: left !default;

// Heading 6
$h6-margin-top: $hx-margin-top !default;
$h6-margin-bottom: $hx-margin-bottom !default;
$h6-font-family: $font-3 !default;
$h6-font-size: 1em !default;
$h6-font-style: normal !default;
$h6-font-weight: normal !default;
$h6-line-height: $hx-line-height !default;
$h6-text-transform: none !default;
$h6-align: left !default;

Expand Down