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

Set font-sizes relative to font-size-base #24060

Merged
merged 5 commits into from Oct 19, 2017
Merged

Set font-sizes relative to font-size-base #24060

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5156106
font-sizes relative to font-size-base
Sep 23, 2017
3839b00
ditch $heading-font-size-base, simplify
mdo Oct 19, 2017
3a929a8
apply same to .lead var
mdo Oct 19, 2017
a0bff3c
also update progress bar font-size var
mdo Oct 19, 2017
98a5d49
Merge branch 'v4-dev' into v4-dev
mdo Oct 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 9 additions & 8 deletions scss/_variables.scss
View file
Open in desktop
Expand Up @@ -206,8 +206,8 @@ $font-family-monospace: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation
$font-family-base: $font-family-sans-serif !default;

$font-size-base: 1rem !default; // Assumes the browser default, typically `16px`
$font-size-lg: 1.25rem !default;
$font-size-sm: .875rem !default;
$font-size-lg: ($font-size-base * 1.25) !default;
$font-size-sm: ($font-size-base * .875) !default;

$font-weight-light: 300 !default;
$font-weight-normal: normal !default;
Expand All @@ -216,12 +216,13 @@ $font-weight-bold: bold !default;
$font-weight-base: $font-weight-normal !default;
$line-height-base: 1.5 !default;

$h1-font-size: 2.5rem !default;
$h2-font-size: 2rem !default;
$h3-font-size: 1.75rem !default;
$h4-font-size: 1.5rem !default;
$h5-font-size: 1.25rem !default;
$h6-font-size: 1rem !default;
$headings-font-size-base: $font-size-base !default;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't introduce a new base for headers

$h1-font-size: ($headings-font-size-base * 2.5) !default;
$h2-font-size: ($headings-font-size-base * 2) !default;
$h3-font-size: ($headings-font-size-base * 1.75) !default;
$h4-font-size: ($headings-font-size-base * 1.5) !default;
$h5-font-size: ($headings-font-size-base * 1.25) !default;
$h6-font-size: ($headings-font-size-base * 1) !default;

$headings-margin-bottom: ($spacer / 2) !default;
$headings-font-family: inherit !default;
Expand Down