diff --git a/CHANGELOG.md b/CHANGELOG.md index 65ac79b8..40caba13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Replace a redirected link to MadeMistakes in footer. [#4882](https://github.com/mmistakes/minimal-mistakes/pull/4882) - Fix wrong float direction for `feature_row` with `type="right"`. [#4061](https://github.com/mmistakes/minimal-mistakes/issues/4061) +- Fix reset stylesheet overruling `$doc-font-size`. [#4983](https://github.com/mmistakes/minimal-mistakes/issues/4983) ### Documentation & Maintenance diff --git a/_sass/minimal-mistakes/_reset.scss b/_sass/minimal-mistakes/_reset.scss index 63805903..13bd9915 100644 --- a/_sass/minimal-mistakes/_reset.scss +++ b/_sass/minimal-mistakes/_reset.scss @@ -8,18 +8,18 @@ html { /* apply a natural box layout model to all elements */ box-sizing: border-box; background-color: $background-color; - font-size: 16px; + font-size: $doc-font-size; @include breakpoint($medium) { - font-size: 18px; + font-size: $doc-font-size-medium; } @include breakpoint($large) { - font-size: 20px; + font-size: $doc-font-size-large; } @include breakpoint($x-large) { - font-size: 22px; + font-size: $doc-font-size-x-large; } -webkit-text-size-adjust: 100%; diff --git a/_sass/minimal-mistakes/_variables.scss b/_sass/minimal-mistakes/_variables.scss index 81a3acf7..2a325873 100644 --- a/_sass/minimal-mistakes/_variables.scss +++ b/_sass/minimal-mistakes/_variables.scss @@ -6,7 +6,10 @@ Typography ========================================================================== */ -$doc-font-size: 16 !default; +$doc-font-size: 16px !default; +$doc-font-size-medium: $doc-font-size * 1.125 !default; +$doc-font-size-large: $doc-font-size * 1.25 !default; +$doc-font-size-x-large: $doc-font-size * 1.375 !default; /* paragraph indention */ $paragraph-indent: false !default; // true, false (default) diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md index 1bf31c75..46bed08e 100644 --- a/docs/_docs/18-history.md +++ b/docs/_docs/18-history.md @@ -5,7 +5,7 @@ permalink: "/docs/history/" excerpt: Change log of enhancements and bug fixes made to the theme. sidebar: nav: docs -last_modified_at: '2024-09-17T16:37:54+08:00' +last_modified_at: '2024-09-20T02:38:49+08:00' toc: false --- @@ -31,6 +31,7 @@ toc: false - Replace a redirected link to MadeMistakes in footer. [#4882](https://github.com/mmistakes/minimal-mistakes/pull/4882) - Fix wrong float direction for `feature_row` with `type="right"`. [#4061](https://github.com/mmistakes/minimal-mistakes/issues/4061) +- Fix reset stylesheet overruling `$doc-font-size`. [#4983](https://github.com/mmistakes/minimal-mistakes/issues/4983) ### Documentation & Maintenance