Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: refactor font sizing into css custom variables (#12746) 

* DEV: refactor font sizing into css custom variables

Add font variables as css variables. Allows plugins/themes to update/overwrite the variables and have core pick up changes. This allows for a theme or plugin to overhaul core's font ratios if desired.
This commit is contained in:
Jeff Wong 2021-04-28 14:21:59 -10:00 committed by GitHub
parent 0abb272289
commit 849b786378
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 54 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/common.scss
View File

@ -1,3 +1,4 @@
@import "common/font-variables";
@import "vendor/normalize";
@import "vendor/normalize-ext";
@import "vendor/pikaday";

31
app/assets/stylesheets/common/font-variables.scss Normal file
View File

@ -0,0 +1,31 @@
:root {
--base-font-size-smallest: 0.815em; // eq. to 13px
--base-font-size-smaller: 0.875em; // eq. to 14px
--base-font-size: 0.938em; // eq. to 15px
--base-font-size-larger: 1.063em; // eq. to 17px
--base-font-size-largest: 1.118em; // eq. to 19px
// Font-size defintions, multiplier ^ (step / interval)
--font-up-6: 2.296em;
--font-up-5: 2em;
--font-up-4: 1.7511em;
--font-up-3: 1.5157em;
--font-up-2: 1.3195em;
--font-up-1: 1.1487em; // 2^(1/5)
--font-0: 1em;
--font-down-1: 0.8706em; // 2^(-1/5)
--font-down-2: 0.7579em; // Smallest size we use based on the 1em base
--font-down-3: 0.6599em;
--font-down-4: 0.5745em;
--font-down-5: 0.5em;
--font-down-6: 0.4355em;
// inputs/textareas in iOS need to be at least 16px to avoid triggering zoom on focus
// with base at 15px, the below gives 16.05px
--font-size-ios-input: 1.07em;
// Common line-heights
--line-height-small: 1;
--line-height-medium: 1.2; // Headings or large text
--line-height-large: 1.4; // Normal or small text
}

46
app/assets/stylesheets/common/foundation/variables.scss
View File

@ -42,37 +42,35 @@ $bronze: #cd7f32 !default;
// Fonts
// --------------------------------------------------
$base-font-size-smallest: 0.815em !default; // eq. to 13px
$base-font-size-smaller: 0.875em !default; // eq. to 14px
$base-font-size: 0.938em !default; // eq. to 15px
$base-font-size-larger: 1.063em !default; // eq. to 17px
$base-font-size-largest: 1.118em !default; // eq. to 19px
$base-font-family: var(--font-family) !default;
$base-font-size-smallest: var(--base-font-size-smallest) !default;
$base-font-size-smaller: var(--base-font-size-smaller) !default;
$base-font-size: var(--base-font-size) !default;
$base-font-size-larger: var(--base-font-size-larger) !default;
$base-font-size-largest: var(--base-font-size-largest) !default;
$heading-font-family: var(--heading-font-family) !default;
// Font-size defintions, multiplier ^ (step / interval)
$font-up-6: 2.296em !default;
$font-up-5: 2em !default;
$font-up-4: 1.7511em !default;
$font-up-3: 1.5157em !default;
$font-up-2: 1.3195em !default;
$font-up-1: 1.1487em !default; // 2^(1/5)
$font-0: 1em;
$font-down-1: 0.8706em !default; // 2^(-1/5)
$font-down-2: 0.7579em !default; // Smallest size we use based on the 1em base
$font-down-3: 0.6599em !default;
$font-down-4: 0.5745em !default;
$font-down-5: 0.5em !default;
$font-down-6: 0.4355em !default;
$font-up-6: var(--font-up-6) !default;
$font-up-5: var(--font-up-5) !default;
$font-up-4: var(--font-up-4) !default;
$font-up-3: var(--font-up-3) !default;
$font-up-2: var(--font-up-2) !default;
$font-up-1: var(--font-up-1) !default;
$font-0: var(--font-0);
$font-down-1: var(--font-down-1) !default;
$font-down-2: var(--font-down-2) !default;
$font-down-3: var(--font-down-3) !default;
$font-down-4: var(--font-down-4) !default;
$font-down-5: var(--font-down-5) !default;
$font-down-6: var(--font-down-6) !default;
// inputs/textareas in iOS need to be at least 16px to avoid triggering zoom on focus
// with base at 15px, the below gives 16.05px
$font-size-ios-input: 1.07em !default;
$font-size-ios-input: var(--font-size-ios-input) !default;
// Common line-heights
$line-height-small: 1 !default;
$line-height-medium: 1.2 !default; // Headings or large text
$line-height-large: 1.4 !default; // Normal or small text
$line-height-small: var(--line-height-small) !default;
$line-height-medium: var(--line-height-medium) !default;
$line-height-large: var(--line-height-large) !default;
@import "common/foundation/math";