From c339499bac2a5f77653130a6fd028b8dd1d3ccb6 Mon Sep 17 00:00:00 2001 From: Alex Shpak Date: Mon, 25 Aug 2025 23:49:46 +0200 Subject: [PATCH] Switch from normalize.css to modern-normalize --- assets/_main.scss | 9 +- assets/_markdown.scss | 21 +- assets/_shortcodes.scss | 6 +- assets/normalize.css | 380 +++++++++++----------------------- assets/plugins/_numbered.scss | 4 +- 5 files changed, 134 insertions(+), 286 deletions(-) diff --git a/assets/_main.scss b/assets/_main.scss index a3c1f09..1691f6a 100644 --- a/assets/_main.scss +++ b/assets/_main.scss @@ -10,23 +10,18 @@ body { color: var(--body-font-color); background: var(--body-background); - // letter-spacing: 0.33px; font-weight: $body-font-weight; text-rendering: optimizeLegibility; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - - box-sizing: border-box; - * { - box-sizing: inherit; - } } h1, h2, h3, h4, -h5 { +h5, +h6 { font-weight: $body-font-weight; } diff --git a/assets/_markdown.scss b/assets/_markdown.scss index a0430a8..99d576b 100644 --- a/assets/_markdown.scss +++ b/assets/_markdown.scss @@ -14,7 +14,7 @@ h4, h5, h6 { - font-weight: normal; + font-weight: $body-font-weight; line-height: 1; margin-top: 1.5em; margin-bottom: $padding-16; @@ -32,19 +32,12 @@ } } - h4, - h5, - h6 { - font-weight: bolder; - } - - h5 { - font-size: 0.875em; - } - - h6 { - font-size: 0.75em; - } + h1 { font-size: $font-size-16 * 2; } + h2 { font-size: $font-size-16 * 1.5; } + h3 { font-size: $font-size-16 * 1.25; } + h4 { font-size: $font-size-16 * 1.125; } + h5 { font-size: $font-size-16 * 1; } + h6 { font-size: $font-size-16 * 0.875; } b, optgroup, diff --git a/assets/_shortcodes.scss b/assets/_shortcodes.scss index b6d9064..ca504fb 100644 --- a/assets/_shortcodes.scss +++ b/assets/_shortcodes.scss @@ -164,13 +164,11 @@ justify-content: center; left: $padding-8; - height: $padding-16; - width: $padding-16; + height: $padding-16 * 1.5; + width: $padding-16 * 1.5; padding: $padding-4; border-radius: $padding-8; - vertical-align: middle; - text-align: center !important ; white-space: nowrap; line-height: $padding-16; diff --git a/assets/normalize.css b/assets/normalize.css index 192eb9c..4b9f38e 100644 --- a/assets/normalize.css +++ b/assets/normalize.css @@ -1,349 +1,213 @@ -/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ +/*! modern-normalize v3.0.1 | MIT License | https://github.com/sindresorhus/modern-normalize */ -/* Document - ========================================================================== */ +/* +Document +======== +*/ /** - * 1. Correct the line height in all browsers. - * 2. Prevent adjustments of font size after orientation changes in iOS. - */ +Use a better box model (opinionated). +*/ + +*, +::before, +::after { + box-sizing: border-box; +} html { - line-height: 1.15; /* 1 */ - -webkit-text-size-adjust: 100%; /* 2 */ + /* Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3) */ + font-family: + system-ui, + 'Segoe UI', + Roboto, + Helvetica, + Arial, + sans-serif, + 'Apple Color Emoji', + 'Segoe UI Emoji'; + line-height: 1.15; /* 1. Correct the line height in all browsers. */ + -webkit-text-size-adjust: 100%; /* 2. Prevent adjustments of font size after orientation changes in iOS. */ + tab-size: 4; /* 3. Use a more readable tab size (opinionated). */ } -/* Sections - ========================================================================== */ - -/** - * Remove the margin in all browsers. - */ +/* +Sections +======== +*/ body { - margin: 0; + margin: 0; /* Remove the margin in all browsers. */ } -/** - * Render the `main` element consistently in IE. - */ - -main { - display: block; -} +/* +Text-level semantics +==================== +*/ /** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ - -h1 { - font-size: 2em; - margin: 0.67em 0; -} - -/* Grouping content - ========================================================================== */ - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ - -hr { - box-sizing: content-box; /* 1 */ - height: 0; /* 1 */ - overflow: visible; /* 2 */ -} - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -pre { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ -} - -/* Text-level semantics - ========================================================================== */ - -/** - * Remove the gray background on active links in IE 10. - */ - -a { - background-color: transparent; -} - -/** - * 1. Remove the bottom border in Chrome 57- - * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. - */ - -abbr[title] { - border-bottom: none; /* 1 */ - text-decoration: underline; /* 2 */ - text-decoration: underline dotted; /* 2 */ -} - -/** - * Add the correct font weight in Chrome, Edge, and Safari. - */ +Add the correct font weight in Chrome and Safari. +*/ b, strong { - font-weight: bolder; + font-weight: bolder; } /** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ +1. Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3) +2. Correct the odd 'em' font sizing in all browsers. +*/ code, kbd, -samp { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ +samp, +pre { + font-family: + ui-monospace, + SFMono-Regular, + Consolas, + 'Liberation Mono', + Menlo, + monospace; /* 1 */ + font-size: 1em; /* 2 */ } /** - * Add the correct font size in all browsers. - */ +Add the correct font size in all browsers. +*/ small { - font-size: 80%; + font-size: 80%; } /** - * Prevent `sub` and `sup` elements from affecting the line height in - * all browsers. - */ +Prevent 'sub' and 'sup' elements from affecting the line height in all browsers. +*/ sub, sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; } sub { - bottom: -0.25em; + bottom: -0.25em; } sup { - top: -0.5em; + top: -0.5em; } -/* Embedded content - ========================================================================== */ +/* +Tabular data +============ +*/ /** - * Remove the border on images inside links in IE 10. - */ +Correct table border color inheritance in Chrome and Safari. (https://issues.chromium.org/issues/40615503, https://bugs.webkit.org/show_bug.cgi?id=195016) +*/ -img { - border-style: none; +table { + border-color: currentcolor; } -/* Forms - ========================================================================== */ +/* +Forms +===== +*/ /** - * 1. Change the font styles in all browsers. - * 2. Remove the margin in Firefox and Safari. - */ +1. Change the font styles in all browsers. +2. Remove the margin in Firefox and Safari. +*/ button, input, optgroup, select, textarea { - font-family: inherit; /* 1 */ - font-size: 100%; /* 1 */ - line-height: 1.15; /* 1 */ - margin: 0; /* 2 */ + font-family: inherit; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ } /** - * Show the overflow in IE. - * 1. Show the overflow in Edge. - */ +Correct the inability to style clickable types in iOS and Safari. +*/ button, -input { /* 1 */ - overflow: visible; +[type='button'], +[type='reset'], +[type='submit'] { + -webkit-appearance: button; } /** - * Remove the inheritance of text transform in Edge, Firefox, and IE. - * 1. Remove the inheritance of text transform in Firefox. - */ - -button, -select { /* 1 */ - text-transform: none; -} - -/** - * Correct the inability to style clickable types in iOS and Safari. - */ - -button, -[type="button"], -[type="reset"], -[type="submit"] { - -webkit-appearance: button; -} - -/** - * Remove the inner border and padding in Firefox. - */ - -button::-moz-focus-inner, -[type="button"]::-moz-focus-inner, -[type="reset"]::-moz-focus-inner, -[type="submit"]::-moz-focus-inner { - border-style: none; - padding: 0; -} - -/** - * Restore the focus styles unset by the previous rule. - */ - -button:-moz-focusring, -[type="button"]:-moz-focusring, -[type="reset"]:-moz-focusring, -[type="submit"]:-moz-focusring { - outline: 1px dotted ButtonText; -} - -/** - * Correct the padding in Firefox. - */ - -fieldset { - padding: 0.35em 0.75em 0.625em; -} - -/** - * 1. Correct the text wrapping in Edge and IE. - * 2. Correct the color inheritance from `fieldset` elements in IE. - * 3. Remove the padding so developers are not caught out when they zero out - * `fieldset` elements in all browsers. - */ +Remove the padding so developers are not caught out when they zero out 'fieldset' elements in all browsers. +*/ legend { - box-sizing: border-box; /* 1 */ - color: inherit; /* 2 */ - display: table; /* 1 */ - max-width: 100%; /* 1 */ - padding: 0; /* 3 */ - white-space: normal; /* 1 */ + padding: 0; } /** - * Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ +Add the correct vertical alignment in Chrome and Firefox. +*/ progress { - vertical-align: baseline; + vertical-align: baseline; } /** - * Remove the default vertical scrollbar in IE 10+. - */ +Correct the cursor style of increment and decrement buttons in Safari. +*/ -textarea { - overflow: auto; +::-webkit-inner-spin-button, +::-webkit-outer-spin-button { + height: auto; } /** - * 1. Add the correct box sizing in IE 10. - * 2. Remove the padding in IE 10. - */ +1. Correct the odd appearance in Chrome and Safari. +2. Correct the outline style in Safari. +*/ -[type="checkbox"], -[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ +[type='search'] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ } /** - * Correct the cursor style of increment and decrement buttons in Chrome. - */ +Remove the inner padding in Chrome and Safari on macOS. +*/ -[type="number"]::-webkit-inner-spin-button, -[type="number"]::-webkit-outer-spin-button { - height: auto; +::-webkit-search-decoration { + -webkit-appearance: none; } /** - * 1. Correct the odd appearance in Chrome and Safari. - * 2. Correct the outline style in Safari. - */ - -[type="search"] { - -webkit-appearance: textfield; /* 1 */ - outline-offset: -2px; /* 2 */ -} - -/** - * Remove the inner padding in Chrome and Safari on macOS. - */ - -[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/** - * 1. Correct the inability to style clickable types in iOS and Safari. - * 2. Change font properties to `inherit` in Safari. - */ +1. Correct the inability to style clickable types in iOS and Safari. +2. Change font properties to 'inherit' in Safari. +*/ ::-webkit-file-upload-button { - -webkit-appearance: button; /* 1 */ - font: inherit; /* 2 */ -} - -/* Interactive - ========================================================================== */ - -/* - * Add the correct display in Edge, IE 10+, and Firefox. - */ - -details { - display: block; + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ } /* - * Add the correct display in all browsers. - */ +Interactive +=========== +*/ + +/* +Add the correct display in Chrome and Safari. +*/ summary { - display: list-item; -} - -/* Misc - ========================================================================== */ - -/** - * Add the correct display in IE 10+. - */ - -template { - display: none; -} - -/** - * Add the correct display in IE 10. - */ - -[hidden] { - display: none; -} + display: list-item; +} \ No newline at end of file diff --git a/assets/plugins/_numbered.scss b/assets/plugins/_numbered.scss index d7ad4d5..3b5570e 100644 --- a/assets/plugins/_numbered.scss +++ b/assets/plugins/_numbered.scss @@ -25,10 +25,8 @@ $endLevel: 6; li { counter-increment: item; - &:before { + > a:before { content: counters(item, ".") ". "; - float: left; - margin-inline-end: $padding-4; } } }