From acfb4eb268a0daf57a8f80f98ea158baa9ad5715 Mon Sep 17 00:00:00 2001 From: Daniel Barber Date: Fri, 11 Oct 2019 22:51:30 -0400 Subject: [PATCH] Adaptive typography --- assets/sass/elements/_html.scss | 2 +- assets/sass/settings/_global.scss | 4 ++-- assets/sass/settings/_typography.scss | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/sass/elements/_html.scss b/assets/sass/elements/_html.scss index 60e84ebb..6d4f3960 100644 --- a/assets/sass/elements/_html.scss +++ b/assets/sass/elements/_html.scss @@ -2,7 +2,7 @@ html { font-family: $body-font-family; font-style: normal; font-weight: 300; - font-size: 1.25em; + font-size: calc((1vmin * 0.85) + 13px); line-height: 1.4; padding-left: $pad-min; padding-right: $pad-min; diff --git a/assets/sass/settings/_global.scss b/assets/sass/settings/_global.scss index f87d8e79..9c0c62aa 100644 --- a/assets/sass/settings/_global.scss +++ b/assets/sass/settings/_global.scss @@ -1,2 +1,2 @@ -$max-width: 816px !default; -$pad-min: 8.5% !default; +$max-width: 40rem !default; +$pad-min: 6.5% !default; diff --git a/assets/sass/settings/_typography.scss b/assets/sass/settings/_typography.scss index e2a6bd2b..b6cf04da 100644 --- a/assets/sass/settings/_typography.scss +++ b/assets/sass/settings/_typography.scss @@ -1,5 +1,5 @@ -$heading-font-family: "Gotham A", "Gotham B", Georgia, Times, "Times New Roman", serif; -$body-font-family: "Mercury SSm A", "Mercury SSm B", Georgia, Times, "Times New Roman", serif; +$heading-font-family: "Gotham A", "Gotham B", sans-serif; +$body-font-family: "Mercury SSm A", "Mercury SSm B", serif; $mono: "Source Code Pro", "Consolas", "Menlo", monospace !default; $header-title-font-family: $heading-font-family !default; $header-subtitle-font-family: $heading-font-family !default;