From 8e3cd1ae8d0ba357c16a932deba2a3d3893cc199 Mon Sep 17 00:00:00 2001 From: Erzbir Date: Mon, 4 Aug 2025 11:57:15 +0800 Subject: [PATCH] refactor: rename variables --- src/styles/buttons.scss | 4 ++-- src/styles/comment.scss | 2 +- src/styles/main.scss | 46 +++++++++++++++++++------------------- src/styles/pagination.scss | 2 +- src/styles/post.scss | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/styles/buttons.scss b/src/styles/buttons.scss index ff1b788..a60b2e3 100644 --- a/src/styles/buttons.scss +++ b/src/styles/buttons.scss @@ -40,13 +40,13 @@ button.link, .button.link, a.button.link { background: none; - font-size: var(--font-size); + font-size: var(--font-theme-size); } button.small, .button.small, a.button.small { - font-size: calc(var(--font-size) * 0.8); + font-size: calc(var(--font-theme-size) * 0.8); } button.wide, diff --git a/src/styles/comment.scss b/src/styles/comment.scss index 659bbd8..89cccc2 100644 --- a/src/styles/comment.scss +++ b/src/styles/comment.scss @@ -30,5 +30,5 @@ comment-widget { } .comment { - margin-top: 80px; + margin-top: 40px; } \ No newline at end of file diff --git a/src/styles/main.scss b/src/styles/main.scss index 06b143c..dafffc9 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -10,16 +10,16 @@ --color-theme-framed: ; --color-theme-menu: ; --color-theme-header: ; - --list-marker: "►"; - --font-size: 1rem; - --line-height: 1.54em; - --radius: 0; + --list-theme-marker: "►"; + --font-theme-size: 1rem; + --line-theme-height: 1.54em; + --radius-theme-default: 0; --font-theme-default: 'JetBrains Mono'; - --font--theme-fallback: Monaco, Consolas, -apple-system, BlinkMacSystemFont, 'segoe ui', + --font-theme-fallback: Monaco, Consolas, -apple-system, BlinkMacSystemFont, 'segoe ui', Roboto, Oxygen, Ubuntu, Cantarell, 'open sans', 'helvetica neue'; @media (max-width: $phone-max-width) { - --font-size: 0.95rem; + --font-theme-size: 0.95rem; } } @@ -48,9 +48,9 @@ html[pixel_style='true'] { body { margin: 0; padding: 0; - font-family: var(--font-theme-default), var(--font--theme-fallback), sans-serif; - font-size: var(--font-size); - line-height: var(--line-height); + font-family: var(--font-theme-default), var(--font-theme-fallback), sans-serif; + font-size: var(--font-theme-size); + line-height: var(--line-theme-height); background-color: var(--color-theme-background); color: var(--color-theme-foreground); text-rendering: optimizelegibility; @@ -60,24 +60,24 @@ body { } h1 { - font-size: calc(var(--font-size) * 1.45); + font-size: calc(var(--font-theme-size) * 1.45); letter-spacing: 0; } h2 { - font-size: calc(var(--font-size) * 1.35); + font-size: calc(var(--font-theme-size) * 1.35); letter-spacing: 0; } h3 { - font-size: calc(var(--font-size) * 1.15); + font-size: calc(var(--font-theme-size) * 1.15); letter-spacing: 0; } h4, h5, h6 { - font-size: calc(var(--font-size) * 1); + font-size: calc(var(--font-theme-size) * 1); letter-spacing: 0; } @@ -112,7 +112,7 @@ button { color: var(--color-theme-accent); padding: 5px 18px; border: 4px solid var(--color-theme-accent); - border-radius: var(--radius); + border-radius: var(--radius-theme-default); transition: background 0.15s linear; appearance: none; cursor: pointer; @@ -132,7 +132,7 @@ a:focus-visible { fieldset { display: inline-block; border: 2px solid var(--color-theme-foreground); - border-radius: calc(var(--radius) * 1.6); + border-radius: calc(var(--radius-theme-default) * 1.6); padding: 10px; } @@ -145,7 +145,7 @@ fieldset select, fieldset textarea, fieldset label, fieldset button { - margin-top: calc(var(--line-height) * 0.5); + margin-top: calc(var(--line-theme-height) * 0.5); width: 100%; } @@ -163,7 +163,7 @@ select { background: transparent; color: var(--color-theme-foreground); border: 1px solid var(--color-theme-foreground); - border-radius: var(--radius); + border-radius: var(--radius-theme-default); padding: 10px; font: inherit; appearance: none; @@ -221,7 +221,7 @@ img { display: block; max-width: 100%; border: 4px solid var(--color-theme-accent); - border-radius: var(--radius); + border-radius: var(--radius-theme-default); padding: 4px; overflow: hidden; } @@ -265,11 +265,11 @@ figure figcaption { background: var(--color-theme-accent); color: var(--color-theme-background); text-align: center; - font-size: var(--font-size); + font-size: var(--font-theme-size); font-weight: normal; margin-top: -8px; padding: 0 8px; - border-radius: 0 0 var(--radius) var(--radius); + border-radius: 0 0 var(--radius-theme-default) var(--radius-theme-default); } figure figcaption p:first-child { @@ -306,7 +306,7 @@ kbd { border: 1px solid var(--code-border); padding: 1px 6px; margin: 0 2px; - font-size: calc(var(--font-size) * 0.95); + font-size: calc(var(--font-theme-size) * 0.95); } kbd { @@ -329,9 +329,9 @@ pre { background: color-mix(in srgb, var(--color-theme-foreground) 5%, transparent) !important; color: var(--color-theme-foreground); padding: 10px 10px; - font-size: calc(var(--font-size) * 0.95) !important; + font-size: calc(var(--font-theme-size) * 0.95) !important; overflow: auto; - border-radius: var(--radius); + border-radius: var(--radius-theme-default); border: 1px solid color-mix(in srgb, var(--color-theme-foreground) 10%, transparent); @media (max-width: $phone-max-width) { diff --git a/src/styles/pagination.scss b/src/styles/pagination.scss index 0a3e74f..be09364 100644 --- a/src/styles/pagination.scss +++ b/src/styles/pagination.scss @@ -16,7 +16,7 @@ padding: 5px 10px; background: var(--color-theme-background); color: color-mix(in srgb, var(--color-theme-foreground) 65%, transparent); - font-size: calc(var(--font-size) * 0.8); + font-size: calc(var(--font-theme-size) * 0.8); text-transform: uppercase; text-decoration: none; letter-spacing: 0.1em; diff --git a/src/styles/post.scss b/src/styles/post.scss index 5af3096..92762d5 100644 --- a/src/styles/post.scss +++ b/src/styles/post.scss @@ -98,7 +98,7 @@ } .post ul li:not(:empty)::before { - content: var(--list-marker); + content: var(--list-theme-marker); position: absolute; left: -20px; color: var(--color-theme-foreground);