diff --git a/_sass/base.scss b/_sass/base.scss index 0dc1ddb..f02880c 100644 --- a/_sass/base.scss +++ b/_sass/base.scss @@ -104,6 +104,6 @@ blockquote { // resets user-agent stylesheets for blockquotes margin-block-start: 0; margin-inline-start: 0; - padding-left: 15px; + padding-left: 1rem; border-left: 3px solid $border-color; } diff --git a/_sass/print.scss b/_sass/print.scss index 5702f15..ee76a3c 100644 --- a/_sass/print.scss +++ b/_sass/print.scss @@ -21,7 +21,7 @@ } .site-title { - font-size: $root-font-size !important; + font-size: 1rem !important; font-weight: 700 !important; } diff --git a/_sass/search.scss b/_sass/search.scss index 6cfe95e..cf8796f 100644 --- a/_sass/search.scss +++ b/_sass/search.scss @@ -42,7 +42,7 @@ width: 100%; height: 100%; padding: $sp-2 $gutter-spacing-sm $sp-2 #{$gutter-spacing-sm + $sp-5}; - font-size: 16px; + font-size: 1rem; color: $body-text-color; background-color: $search-background-color; border-top: 0; @@ -53,7 +53,7 @@ @include mq(md) { padding: $sp-2 $gutter-spacing-sm $sp-2 #{$gutter-spacing + $sp-5}; - font-size: 14px; + font-size: 0.875rem; background-color: $body-background-color; transition: padding-left linear #{$transition-duration * 0.5}; } diff --git a/_sass/support/_functions.scss b/_sass/support/_functions.scss deleted file mode 100644 index 290709a..0000000 --- a/_sass/support/_functions.scss +++ /dev/null @@ -1,9 +0,0 @@ -@function rem($size, $unit: "") { - $rem-size: $size / $root-font-size; - - @if $unit == false { - @return #{$rem-size}; - } @else { - @return #{$rem-size}rem; - } -} diff --git a/_sass/support/_variables.scss b/_sass/support/_variables.scss index 42a1cf8..6767357 100644 --- a/_sass/support/_variables.scss +++ b/_sass/support/_variables.scss @@ -3,7 +3,7 @@ $body-font-family: system-ui, -apple-system, blinkmacsystemfont, "Segoe UI", roboto, "Helvetica Neue", arial, sans-serif !default; $mono-font-family: "SFMono-Regular", menlo, consolas, monospace !default; -$root-font-size: 16px !default; // Base font-size for rems +$root-font-size: 16px !default; // DEPRECATED: previously base font-size for rems $body-line-height: 1.4 !default; $content-line-height: 1.6 !default; $body-heading-line-height: 1.25 !default; @@ -11,18 +11,18 @@ $body-heading-line-height: 1.25 !default; // Font size // `-sm` suffix is the size at the small (and above) media query -$font-size-1: 9px !default; -$font-size-1-sm: 10px !default; -$font-size-2: 11px !default; // h4 - uppercased!, h6 not uppercased, text-small -$font-size-3: 12px !default; // h5 -$font-size-4: 14px !default; -$font-size-5: 16px !default; // h3 -$font-size-6: 18px !default; // h2 -$font-size-7: 24px !default; -$font-size-8: 32px !default; // h1 -$font-size-9: 36px !default; -$font-size-10: 42px !default; -$font-size-10-sm: 48px !default; +$font-size-1: 0.5625rem !default; +$font-size-1-sm: 0.625rem !default; +$font-size-2: 0.6875rem !default; // h4 - uppercased!, h6 not uppercased, text-small +$font-size-3: 0.75rem !default; // h5 +$font-size-4: 0.875rem !default; +$font-size-5: 1rem !default; // h3 +$font-size-6: 1.125rem !default; // h2 +$font-size-7: 1.5rem !default; +$font-size-8: 2rem !default; // h1 +$font-size-9: 2.25rem !default; +$font-size-10: 2.625rem !default; +$font-size-10-sm: 3rem !default; // Colors @@ -95,22 +95,22 @@ $border-color: $grey-lt-100 !default; $gutter-spacing: $sp-6 !default; $gutter-spacing-sm: $sp-4 !default; -$nav-width: 264px !default; -$nav-width-md: 248px !default; +$nav-width: 16.5rem !default; +$nav-width-md: 15.5rem !default; $nav-list-item-height: $sp-6 !default; $nav-list-item-height-sm: $sp-8 !default; $nav-list-expander-right: true; -$content-width: 800px !default; -$header-height: 60px !default; +$content-width: 50rem !default; +$header-height: 3.75rem !default; $search-results-width: $content-width - $nav-width !default; $transition-duration: 400ms; // Media queries in pixels $media-queries: ( - xs: 320px, - sm: 500px, + xs: 20rem, + sm: 31.25rem, md: $content-width, lg: $content-width + $nav-width, - xl: 1400px, + xl: 87.5rem, ) !default; diff --git a/_sass/support/mixins/_layout.scss b/_sass/support/mixins/_layout.scss index 428dec6..a9b32ee 100644 --- a/_sass/support/mixins/_layout.scss +++ b/_sass/support/mixins/_layout.scss @@ -12,7 +12,7 @@ // If the key exists in the map @if $value { // Prints a media query based on the value - @media (min-width: rem($value)) { + @media (min-width: $value) { @content; } } @else { diff --git a/_sass/support/support.scss b/_sass/support/support.scss index 8131a32..e800592 100644 --- a/_sass/support/support.scss +++ b/_sass/support/support.scss @@ -1,3 +1,2 @@ @import "./variables"; -@import "./functions"; @import "./mixins/mixins"; diff --git a/_sass/tables.scss b/_sass/tables.scss index db8f9de..7bc08ba 100644 --- a/_sass/tables.scss +++ b/_sass/tables.scss @@ -21,7 +21,7 @@ th, td { @include fs-3; - min-width: 120px; + min-width: 7.5rem; padding: $sp-2 $sp-3; background-color: $table-background-color; border-bottom: $border rgba($border-color, 0.5);