diff --git a/settings.yaml b/settings.yaml index 626cf93..4f92c1b 100644 --- a/settings.yaml +++ b/settings.yaml @@ -291,54 +291,70 @@ spec: label: 背景色 validation: "required" - $formkit: color - name: foreground - label: 前景色 + name: text + label: 主文本色 validation: "required" - $formkit: color - name: accent - label: 强调色 + name: action + label: 交互强调色 validation: "required" - $formkit: checkbox name: advanced label: 高级颜色设置 value: false - help: 开启后可以单独设置标签, 标题, 元信息, 链接和代码等颜色 + help: 开启后可以单独设置辅助文本, 标题, 标签, 导航, 控件, 边框和代码等语义颜色 - $formkit: color if: "$value.advanced === true" - name: foreground_muted - label: 次要前景色 + name: text_secondary + label: 辅助文本色 - $formkit: color if: "$value.advanced === true" - name: muted + name: text_muted label: 弱化文字颜色 - $formkit: color if: "$value.advanced === true" - name: tag - label: 标签颜色 + name: text_inverse + label: 反色文字颜色 - $formkit: color if: "$value.advanced === true" - name: title + name: heading label: 标题颜色 - $formkit: color if: "$value.advanced === true" - name: meta - label: 元信息颜色 - - $formkit: color - if: "$value.advanced === true" - name: framed - label: 强调框颜色 - - $formkit: color - if: "$value.advanced === true" - name: menu - label: 菜单颜色 - - $formkit: color - if: "$value.advanced === true" - name: header - label: 页头颜色 + name: label + label: 标签颜色 - $formkit: color if: "$value.advanced === true" name: link label: 链接颜色 + - $formkit: color + if: "$value.advanced === true" + name: navigation + label: 导航颜色 + - $formkit: color + if: "$value.advanced === true" + name: control + label: 控件颜色 + - $formkit: color + if: "$value.advanced === true" + name: border + label: 默认边框颜色 + - $formkit: color + if: "$value.advanced === true" + name: border_accent + label: 交互边框颜色 + - $formkit: color + if: "$value.advanced === true" + name: border_emphasis + label: 强调边框颜色 + - $formkit: color + if: "$value.advanced === true" + name: selection + label: 选中文本背景色 + - $formkit: color + if: "$value.advanced === true" + name: caret + label: 动态光标颜色 - $formkit: color if: "$value.advanced === true" name: code_text diff --git a/src/styles/buttons.scss b/src/styles/buttons.scss index 2b746f4..db8e2a5 100644 --- a/src/styles/buttons.scss +++ b/src/styles/buttons.scss @@ -58,7 +58,7 @@ a.button.wide { a.button.inline { background: none; - color: var(--color-theme-accent); + color: var(--color-theme-action); padding: initial; margin: initial; border: initial; diff --git a/src/styles/comment.scss b/src/styles/comment.scss index 3ea2a5f..33168f6 100644 --- a/src/styles/comment.scss +++ b/src/styles/comment.scss @@ -3,24 +3,24 @@ comment-widget { --halo-cw-base-rounded: var(--radius-theme-border) !important; --halo-cw-base-font-size: var(--size-theme-font) !important; - --halo-cw-primary-1-color: var(--color-theme-accent) !important; - --halo-cw-primary-2-color: var(--color-theme-accent-muted) !important; - --halo-cw-primary-3-color: var(--color-theme-accent-subtle) !important; + --halo-cw-primary-1-color: var(--color-theme-action) !important; + --halo-cw-primary-2-color: var(--color-theme-action-muted) !important; + --halo-cw-primary-3-color: var(--color-theme-action-subtle) !important; - --halo-cw-text-1-color: var(--color-theme-foreground) !important; - --halo-cw-text-2-color: var(--color-theme-foreground-muted) !important; - --halo-cw-text-3-color: var(--color-theme-foreground-muted) !important; + --halo-cw-text-1-color: var(--color-theme-text) !important; + --halo-cw-text-2-color: var(--color-theme-text-secondary) !important; + --halo-cw-text-3-color: var(--color-theme-text-secondary) !important; - --halo-cw-muted-1-color: var(--color-theme-muted) !important; - --halo-cw-muted-2-color: var(--color-theme-accent-subtle) !important; + --halo-cw-muted-1-color: var(--color-theme-text-muted) !important; + --halo-cw-muted-2-color: var(--color-theme-action-subtle) !important; --halo-cw-muted-3-color: var(--color-theme-surface) !important; --halo-cw-emoji-picker-rgb-color: var(--color-theme-background) !important; - --halo-cw-emoji-picker-rgb-accent: var(--color-theme-foreground) !important; + --halo-cw-emoji-picker-rgb-accent: var(--color-theme-text) !important; --halo-cw-emoji-picker-rgb-background: var(--color-theme-background) !important; - --halo-cw-emoji-picker-rgb-input: var(--color-theme-foreground) !important; + --halo-cw-emoji-picker-rgb-input: var(--color-theme-text) !important; --halo-cw-emoji-picker-color-border: var(--color-theme-border-muted) !important; - --halo-cw-emoji-picker-color-border-over: var(--color-theme-accent) !important; + --halo-cw-emoji-picker-color-border-over: var(--color-theme-border-accent) !important; // --halo-cw-avatar-rounded: // --halo-cw-avatar-size @@ -29,32 +29,32 @@ comment-widget { --halo-comment-widget-base-border-radius: var(--radius-theme-border) !important; --halo-comment-widget-base-font-size: var(--size-theme-font) !important; --halo-comment-widget-base-line-height: var(--height-theme-line) !important; - --halo-comment-widget-base-color: var(--color-theme-foreground) !important; - --halo-comment-widget-base-info-color: var(--color-theme-muted) !important; + --halo-comment-widget-base-color: var(--color-theme-text) !important; + --halo-comment-widget-base-info-color: var(--color-theme-text-muted) !important; --halo-comment-widget-component-form-input-bg-color: var(--color-theme-surface) !important; - --halo-comment-widget-component-form-input-color: var(--color-theme-foreground) !important; + --halo-comment-widget-component-form-input-color: var(--color-theme-text) !important; --halo-comment-widget-component-form-input-border-color: var(--color-theme-border-muted) !important; - --halo-comment-widget-component-form-input-border-color-focus: var(--color-theme-accent) !important; - --halo-comment-widget-component-form-input-box-shadow-focus: var(--color-theme-accent) !important; + --halo-comment-widget-component-form-input-border-color-focus: var(--color-theme-border-accent) !important; + --halo-comment-widget-component-form-input-box-shadow-focus: var(--color-theme-action) !important; --halo-comment-widget-component-form-button-login-bg-color: var(--color-theme-background) !important; --halo-comment-widget-component-form-button-login-bg-color-hover: var(--color-theme-surface-hover) !important; --halo-comment-widget-component-form-button-login-border-color: var(--color-theme-border-muted) !important; - --halo-comment-widget-component-form-button-submit-bg-color: var(--color-theme-accent) !important; - --halo-comment-widget-component-form-button-submit-color: var(--color-theme-background) !important; - --halo-comment-widget-component-form-button-submit-border-color: var(--color-theme-accent) !important; - --halo-comment-widget-component-form-button-submit-border-color-hover: var(--color-theme-accent-muted) !important; - --halo-comment-widget-component-form-button-emoji-color: var(--color-theme-accent) !important; + --halo-comment-widget-component-form-button-submit-bg-color: var(--color-theme-action) !important; + --halo-comment-widget-component-form-button-submit-color: var(--color-theme-text-inverse) !important; + --halo-comment-widget-component-form-button-submit-border-color: var(--color-theme-border-accent) !important; + --halo-comment-widget-component-form-button-submit-border-color-hover: var(--color-theme-action-muted) !important; + --halo-comment-widget-component-form-button-emoji-color: var(--color-theme-action) !important; --halo-comment-widget-component-comment-item-action-bg-color-hover: var(--color-theme-surface-hover) !important; - --halo-comment-widget-component-comment-item-action-color-hover: var(--color-theme-accent) !important; + --halo-comment-widget-component-comment-item-action-color-hover: var(--color-theme-action) !important; --halo-comment-widget-component-pagination-button-bg-color-hover: var(--color-theme-surface-hover) !important; --halo-comment-widget-component-pagination-button-bg-color-active: var(--color-theme-surface-hover) !important; - --halo-comment-widget-component-pagination-button-border-color-active: var(--color-theme-accent) !important; + --halo-comment-widget-component-pagination-button-border-color-active: var(--color-theme-border-accent) !important; --halo-comment-widget-component-emoji-picker-rgb-color: var(--color-theme-background) !important; - --halo-comment-widget-component-emoji-picker-rgb-accent: var(--color-theme-foreground) !important; + --halo-comment-widget-component-emoji-picker-rgb-accent: var(--color-theme-text) !important; --halo-comment-widget-component-emoji-picker-rgb-background: var(--color-theme-background) !important; - --halo-comment-widget-component-emoji-picker-rgb-input: var(--color-theme-foreground) !important; + --halo-comment-widget-component-emoji-picker-rgb-input: var(--color-theme-text) !important; --halo-comment-widget-component-emoji-picker-color-border: var(--color-theme-border-muted) !important; - --halo-comment-widget-component-emoji-picker-color-border-over: var(--color-theme-accent) !important; + --halo-comment-widget-component-emoji-picker-color-border-over: var(--color-theme-border-accent) !important; } .comment { diff --git a/src/styles/contact.scss b/src/styles/contact.scss index 04f10af..4e5b862 100644 --- a/src/styles/contact.scss +++ b/src/styles/contact.scss @@ -4,19 +4,19 @@ halo-contact-form { --halo-contact-form-line-height: var(--height-theme-line) !important; --halo-contact-form-border-radius: var(--radius-theme-border) !important; --halo-contact-form-width-submit: auto !important; - --halo-contact-form-color-primary: var(--color-theme-accent) !important; - --halo-contact-form-color-label: var(--color-theme-foreground) !important; - --halo-contact-form-color-input: var(--color-theme-foreground) !important; - --halo-contact-form-color-input-selection: var(--color-theme-highlight) !important; - --halo-contact-form-color-border: var(--color-theme-foreground) !important; + --halo-contact-form-color-primary: var(--color-theme-action) !important; + --halo-contact-form-color-label: var(--color-theme-text) !important; + --halo-contact-form-color-input: var(--color-theme-text) !important; + --halo-contact-form-color-input-selection: var(--color-theme-selection) !important; + --halo-contact-form-color-border: var(--color-theme-border) !important; // --halo-contact-form-color-danger: ; - --halo-contact-form-color-help: var(--color-theme-foreground-muted) !important; - --halo-contact-form-color-button: var(--color-theme-background) !important; + --halo-contact-form-color-help: var(--color-theme-text-secondary) !important; + --halo-contact-form-color-button: var(--color-theme-text-inverse) !important; --halo-contact-form-color-button-hover: var(--halo-contact-form-color-button) !important; - --halo-contact-form-focus-ring-color: var(--color-theme-foreground); + --halo-contact-form-focus-ring-color: var(--color-theme-action); // --halo-contact-form-error-ring-color: ; // --halo-contact-form-error-ring-focus-color: ; --halo-contact-form-bg-input: var(--color-theme-background) !important; --halo-contact-form-bg-decorator: var(--color-theme-background) !important; - --halo-contact-form-auto-color-modal-bg: var(--color-theme-foreground) !important; -} \ No newline at end of file + --halo-contact-form-auto-color-modal-bg: var(--color-theme-text) !important; +} diff --git a/src/styles/friends.scss b/src/styles/friends.scss index 925d2a2..0821aac 100644 --- a/src/styles/friends.scss +++ b/src/styles/friends.scss @@ -17,14 +17,14 @@ display: inline-flex; align-items: center; gap: calc(var(--size-theme-font) * 0.35); - color: var(--color-theme-meta); + color: var(--color-theme-text-muted); text-decoration: none; } &-post-desc { margin: 0; padding: 0; - color: var(--color-theme-foreground); + color: var(--color-theme-text); font-size: calc(var(--size-theme-font) * 0.875); } } diff --git a/src/styles/header.scss b/src/styles/header.scss index 114ebcb..97cc2f0 100644 --- a/src/styles/header.scss +++ b/src/styles/header.scss @@ -35,7 +35,7 @@ margin: 0; padding: 0; background: var(--color-theme-background); - border: var(--width-theme-border) var(--style-theme-border) var(--color-theme-header); + border: var(--width-theme-border) var(--style-theme-border) var(--color-theme-border); &[hidden] { display: none; @@ -47,10 +47,10 @@ width: 100%; margin: 0; padding: calc(var(--size-theme-font) * 0.35) calc(var(--size-theme-font) * 0.4); - color: var(--color-theme-header); + color: var(--color-theme-control); background: var(--color-theme-background); border: 0; - border-bottom: calc(var(--width-theme-border) / 2) var(--style-theme-border) var(--color-theme-header); + border-bottom: calc(var(--width-theme-border) / 2) var(--style-theme-border) var(--color-theme-border); border-radius: 0; font-size: calc(var(--size-theme-font) * 0.8); font-weight: 500; @@ -65,8 +65,8 @@ &:focus-visible, &[aria-selected="true"] { - color: var(--color-theme-background); - background: var(--color-theme-header); + color: var(--color-theme-text-inverse); + background: var(--color-theme-control); outline: none; } } @@ -76,8 +76,8 @@ #search-button, #pixel-toggle { background-color: transparent; - color: var(--color-theme-header); - border: var(--width-theme-border) var(--style-theme-border) var(--color-theme-header); + color: var(--color-theme-control); + border: var(--width-theme-border) var(--style-theme-border) var(--color-theme-border); margin: 0; padding: 0; } @@ -96,7 +96,7 @@ &::after { content: ""; - background: repeating-linear-gradient(90deg, var(--color-theme-header), var(--color-theme-header) var(--width-theme-border), transparent 0, transparent calc(var(--size-theme-font) * 0.625)); + background: repeating-linear-gradient(90deg, var(--color-theme-control), var(--color-theme-control) var(--width-theme-border), transparent 0, transparent calc(var(--size-theme-font) * 0.625)); display: block; width: 100%; right: calc(var(--size-theme-font) * 0.625); @@ -114,8 +114,8 @@ display: flex; align-items: center; text-decoration: none; - background: var(--color-theme-header); - color: var(--color-theme-background); + background: var(--color-theme-control); + color: var(--color-theme-text-inverse); font-weight: 500; padding: calc(var(--size-theme-font) * 0.3125) calc(var(--size-theme-font) * 0.625); } diff --git a/src/styles/links.scss b/src/styles/links.scss index f03b134..7e3f316 100644 --- a/src/styles/links.scss +++ b/src/styles/links.scss @@ -18,10 +18,10 @@ margin: 0; > span { - color: var(--color-theme-accent); + color: var(--color-theme-action); padding: 0.1em 0.45em; - border-top: var(--width-theme-border) var(--style-theme-border) var(--color-theme-accent); - border-bottom: var(--width-theme-border) var(--style-theme-border) var(--color-theme-accent); + border-top: var(--width-theme-border) var(--style-theme-border) var(--color-theme-border-accent); + border-bottom: var(--width-theme-border) var(--style-theme-border) var(--color-theme-border-accent); } } } @@ -77,11 +77,11 @@ } &-name { - color: var(--color-theme-foreground); + color: var(--color-theme-text); } &-url { - color: var(--color-theme-meta); + color: var(--color-theme-text-muted); font-size: calc(var(--size-theme-font) * 0.8); opacity: 0.7; white-space: nowrap; @@ -90,7 +90,7 @@ } &-description { - color: var(--color-theme-foreground); + color: var(--color-theme-text); font-size: calc(var(--size-theme-font) * 0.82); line-height: var(--height-theme-line); white-space: nowrap; @@ -117,7 +117,7 @@ align-items: baseline; gap: calc(var(--size-theme-font) * 0.25); margin: 0; - color: var(--color-theme-foreground); + color: var(--color-theme-text); font-size: calc(var(--size-theme-font) * 0.85); } @@ -133,7 +133,7 @@ } &-required { - color: var(--color-theme-accent); + color: var(--color-theme-action); font-style: normal; } @@ -164,10 +164,10 @@ object-fit: contain; background: #fff; cursor: pointer; - border: calc(var(--width-theme-border) / 2) var(--style-theme-border) var(--color-theme-foreground); + border: calc(var(--width-theme-border) / 2) var(--style-theme-border) var(--color-theme-border); &:hover { - border-color: var(--color-theme-accent); + border-color: var(--color-theme-border-accent); } } @@ -179,10 +179,10 @@ justify-content: center; cursor: pointer; background: var(--color-theme-background); - border: calc(var(--width-theme-border) / 2) var(--style-theme-border) var(--color-theme-accent); + border: calc(var(--width-theme-border) / 2) var(--style-theme-border) var(--color-theme-border-accent); span { - color: var(--color-theme-accent); + color: var(--color-theme-action); font-size: calc(var(--size-theme-font) * 0.75); text-align: center; } @@ -192,8 +192,8 @@ &-apply-message { margin-bottom: calc(var(--size-theme-font) * 1); padding: calc(var(--size-theme-font) * 0.5) 0; - color: var(--color-theme-accent); - border-bottom: calc(var(--width-theme-border) / 2) var(--style-theme-table-border) var(--color-theme-accent); + color: var(--color-theme-action); + border-bottom: calc(var(--width-theme-border) / 2) var(--style-theme-table-border) var(--color-theme-border-accent); } &-apply-submit-btn { diff --git a/src/styles/main.scss b/src/styles/main.scss index 0aa011d..44a04d3 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -55,7 +55,7 @@ body { font-size: var(--size-theme-font); line-height: var(--height-theme-line); background-color: var(--color-theme-background); - color: var(--color-theme-foreground); + color: var(--color-theme-text); text-rendering: optimizelegibility; -webkit-font-smoothing: antialiased; -webkit-overflow-scrolling: touch; @@ -174,9 +174,9 @@ button { text-decoration: none; text-align: center; background: transparent; - color: var(--color-theme-accent); + color: var(--color-theme-action); padding: calc(var(--size-theme-font) * 0.2) calc(var(--size-theme-font) * .7); - border: calc(var(--width-theme-border) * 1.25) var(--style-theme-border) var(--color-theme-accent); + border: calc(var(--width-theme-border) * 1.25) var(--style-theme-border) var(--color-theme-border-accent); border-radius: var(--radius-theme-border); transition: background 0.15s linear; appearance: none; @@ -186,13 +186,13 @@ button { button:focus-visible, a:focus-visible { - outline: 1px solid var(--color-theme-accent); + outline: 1px solid var(--color-theme-action); outline-offset: 2px; } fieldset { display: inline-block; - border: var(--width-theme-border) var(--style-theme-border) var(--color-theme-foreground); + border: var(--width-theme-border) var(--style-theme-border) var(--color-theme-border); border-radius: var(--radius-theme-border); padding: calc(var(--size-theme-font) * 0.625); } @@ -222,8 +222,8 @@ input, textarea, select { background: transparent; - color: var(--color-theme-foreground); - border: calc(var(--width-theme-border) / 2) var(--style-theme-border) var(--color-theme-foreground); + color: var(--color-theme-text); + border: calc(var(--width-theme-border) / 2) var(--style-theme-border) var(--color-theme-border); border-radius: var(--radius-theme-border); padding: calc(var(--size-theme-font) * 0.625); font: inherit; @@ -240,8 +240,8 @@ textarea:focus-visible, textarea:active, select:focus-visible, select:active { - border-color: var(--color-theme-accent); - outline: calc(var(--size-theme-font) * 0.0625) var(--style-theme-border) var(--color-theme-accent); + border-color: var(--color-theme-border-accent); + outline: calc(var(--size-theme-font) * 0.0625) var(--style-theme-border) var(--color-theme-action); outline-offset: calc(var(--size-theme-font) * 0.125); } @@ -255,9 +255,9 @@ select { background-image: linear-gradient( 45deg, transparent 50%, - var(--color-theme-foreground) 50% + var(--color-theme-text) 50% ), - linear-gradient(135deg, var(--color-theme-foreground) 50%, transparent 50%); + linear-gradient(135deg, var(--color-theme-text) 50%, transparent 50%); background-position: calc(100% - 1.25em), calc(100% - 1em); background-size: calc(var(--size-theme-font) * 0.3125) calc(var(--size-theme-font) * 0.3125), calc(var(--size-theme-font) * 0.3125) calc(var(--size-theme-font) * 0.3125); background-repeat: no-repeat; @@ -274,13 +274,13 @@ input[type="checkbox"] { } input[type="checkbox"]:checked { - background: var(--color-theme-accent); + background: var(--color-theme-action); } img { display: block; max-width: 100%; - border: var(--width-theme-border) var(--style-theme-border) var(--color-theme-accent); + border: var(--width-theme-border) var(--style-theme-border) var(--color-theme-border-accent); border-radius: var(--radius-theme-border); padding: calc(var(--size-theme-font) * 0.125); overflow: hidden; @@ -322,8 +322,8 @@ figure video { } figure figcaption { - background: var(--color-theme-accent); - color: var(--color-theme-background); + background: var(--color-theme-action); + color: var(--color-theme-text-inverse); text-align: center; font-size: var(--size-theme-font); font-weight: normal; @@ -355,7 +355,7 @@ ol li { } li::marker { - color: var(--color-theme-accent); + color: var(--color-theme-action); } code { @@ -375,10 +375,10 @@ kbd { kbd { background: var(--color-theme-surface-hover); - border-top: calc(var(--width-theme-border) / 2) solid var(--color-theme-accent-subtle); - border-left: calc(var(--width-theme-border) / 2) solid var(--color-theme-accent); - border-right: calc(var(--width-theme-border) / 2) solid var(--color-theme-accent); - border-bottom: calc(var(--width-theme-border) * 2) solid var(--color-theme-accent); + border-top: calc(var(--width-theme-border) / 2) solid var(--color-theme-action-subtle); + border-left: calc(var(--width-theme-border) / 2) solid var(--color-theme-border-accent); + border-right: calc(var(--width-theme-border) / 2) solid var(--color-theme-border-accent); + border-bottom: calc(var(--width-theme-border) * 2) solid var(--color-theme-border-accent); border-radius: calc(var(--size-theme-font) * 0.25); } @@ -392,7 +392,7 @@ pre { font-family: inherit !important; tab-size: 4; background: var(--color-theme-surface) !important; - color: var(--color-theme-foreground); + color: var(--color-theme-text); padding: calc(var(--size-theme-font) * 0.625) calc(var(--size-theme-font) * 0.625); font-size: calc(var(--size-theme-font) * 0.95) !important; overflow: auto; @@ -420,7 +420,7 @@ sup { abbr { position: relative; text-decoration-style: wavy; - text-decoration-color: var(--color-theme-accent); + text-decoration-color: var(--color-theme-action); cursor: help; } @@ -433,13 +433,13 @@ sup { } mark { - background: var(--color-theme-highlight); - color: var(--color-theme-foreground); + background: var(--color-theme-selection); + color: var(--color-theme-text); } blockquote { position: relative; - border-left: var(--width-theme-border) var(--style-theme-border) var(--color-theme-accent); + border-left: var(--width-theme-border) var(--style-theme-border) var(--color-theme-border-accent); margin: calc(var(--size-theme-font) * 0.625) 0 calc(var(--size-theme-font) * 0.625) 0; padding: calc(var(--size-theme-font) * 0.625) calc(var(--size-theme-font) * 1.25); } @@ -460,13 +460,13 @@ table { table, th, td { - border: var(--width-theme-table-border) var(--style-theme-table-border) var(--color-theme-accent); + border: var(--width-theme-table-border) var(--style-theme-table-border) var(--color-theme-border-accent); padding: calc(var(--size-theme-font) * 0.625); } th { border-style: var(--style-theme-table-border); - color: var(--color-theme-accent); + color: var(--color-theme-action); white-space: nowrap; text-align: left; letter-spacing: calc(var(--size-theme-font) * 0.04); @@ -475,7 +475,7 @@ th { hr { width: 100%; border: none; - background: var(--color-theme-accent); + background: var(--color-theme-action); height: calc(var(--size-theme-font) * 0.125); } @@ -505,12 +505,12 @@ blockquote.twitter-tweet { background: var(--color-theme-background); font: inherit; color: inherit; - border: calc(var(--width-theme-border) / 2) var(--style-theme-border) var(--color-theme-accent); + border: calc(var(--width-theme-border) / 2) var(--style-theme-border) var(--color-theme-border-accent); padding-top: calc(var(--size-theme-font) * 3.75); } blockquote.twitter-tweet a { - color: var(--color-theme-accent); + color: var(--color-theme-action); text-decoration: var(--text-decoration-theme-post-link); } @@ -519,7 +519,7 @@ blockquote.twitter-tweet::before { position: absolute; top: calc(var(--size-theme-font) * 1.25); left: calc(var(--size-theme-font) * 1.25); - color: var(--color-theme-accent); + color: var(--color-theme-action); font-weight: bold; } @@ -556,6 +556,6 @@ blockquote.twitter-tweet::before { } iframe[src*="youtube.com"] { - border: calc(var(--width-theme-border) * 2) var(--style-theme-border) var(--color-theme-accent) !important; + border: calc(var(--width-theme-border) * 2) var(--style-theme-border) var(--color-theme-border-accent) !important; padding: calc(var(--size-theme-font) * 0.5) !important; } diff --git a/src/styles/menu.scss b/src/styles/menu.scss index 036e5e0..022e886 100644 --- a/src/styles/menu.scss +++ b/src/styles/menu.scss @@ -8,7 +8,7 @@ a { text-decoration: none; - color: var(--color-theme-menu); + color: var(--color-theme-navigation); } @media (max-width: $phone-max-width) { @@ -93,7 +93,7 @@ margin-right: 0; padding-left: calc(var(--size-theme-font) * 0.3125); padding-right: calc(var(--size-theme-font) * 0.3125); - color: var(--color-theme-menu); + color: var(--color-theme-navigation); user-select: none; border: none; display: inline-flex; @@ -112,8 +112,8 @@ flex-direction: column; position: absolute; background: var(--color-theme-background); - color: var(--color-theme-accent); - border: calc(var(--size-theme-font) * 0.125) solid var(--color-theme-menu); + color: var(--color-theme-action); + border: calc(var(--size-theme-font) * 0.125) solid var(--color-theme-border); margin: 0; padding: calc(var(--size-theme-font) * 0.3125); top: calc(var(--size-theme-font) * 1.5625); diff --git a/src/styles/moment.scss b/src/styles/moment.scss index 9485b63..d5ef8bd 100644 --- a/src/styles/moment.scss +++ b/src/styles/moment.scss @@ -27,14 +27,14 @@ gap: 0.35em; border: none; font-size: calc(var(--size-theme-font) * 0.85); - color: var(--color-theme-foreground); + color: var(--color-theme-text); &:hover { background: none; } &.active { - color: var(--color-theme-accent); + color: var(--color-theme-action); } } diff --git a/src/styles/pagination.scss b/src/styles/pagination.scss index 76eb22c..b22d9c2 100644 --- a/src/styles/pagination.scss +++ b/src/styles/pagination.scss @@ -11,7 +11,7 @@ hr { position: absolute; - background-color: var(--color-theme-accent-muted); + background-color: var(--color-theme-action-muted); left: 0; right: 0; width: 100%; @@ -24,7 +24,7 @@ margin: 0 auto; padding: calc(var(--size-theme-font) * 0.3125) calc(var(--size-theme-font) * 0.625); background: var(--color-theme-background); - color: var(--color-theme-muted); + color: var(--color-theme-text-muted); font-size: calc(var(--size-theme-font) * 0.8); text-decoration: none; letter-spacing: 0.1em; @@ -72,7 +72,7 @@ white-space: nowrap; overflow: hidden; text-decoration: none; - color: var(--color-theme-foreground); + color: var(--color-theme-text); @media (max-width: $phone-max-width) { width: 100%; diff --git a/src/styles/portfolio.scss b/src/styles/portfolio.scss index f82c3f7..424a30a 100644 --- a/src/styles/portfolio.scss +++ b/src/styles/portfolio.scss @@ -18,7 +18,7 @@ flex-direction: column; min-width: 0; padding: calc(var(--size-theme-font) * 0.875); - border: calc(var(--size-theme-font) * 0.0625) var(--style-theme-border) var(--color-theme-framed); + border: calc(var(--size-theme-font) * 0.0625) var(--style-theme-border) var(--color-theme-border-emphasis); } .portfolio-card-cover { @@ -41,7 +41,7 @@ } .portfolio-card-label { - color: var(--color-theme-tag); + color: var(--color-theme-label); font-size: calc(var(--size-theme-font) * 0.86); line-height: calc(var(--size-theme-font) * 1.4); } @@ -93,7 +93,7 @@ } .portfolio-meta .portfolio-term { - color: var(--color-theme-accent); + color: var(--color-theme-action); } .portfolio-meta .portfolio-term:not(:last-child), @@ -104,13 +104,13 @@ .portfolio-item .portfolio-tags, .portfolio-item .portfolio-tags .portfolio-tag { - color: var(--color-theme-tag); + color: var(--color-theme-label); } .portfolio-detail-post .portfolio-meta-line, .portfolio-detail-post .portfolio-meta-line .portfolio-card-label, .portfolio-detail-post .portfolio-meta-line .portfolio-tag { - color: var(--color-theme-meta); + color: var(--color-theme-text-muted); } .portfolio-detail-post .portfolio-meta-line.post-meta { @@ -119,11 +119,11 @@ .portfolio-detail-post .portfolio-techs, .portfolio-detail-post .portfolio-techs .portfolio-term { - color: var(--color-theme-accent); + color: var(--color-theme-action); } .portfolio-item .post-excerpt { - color: var(--color-theme-foreground); + color: var(--color-theme-text); font-size: calc(var(--size-theme-font) * 0.86); line-height: calc(var(--size-theme-font) * 1.55); margin-top: calc(var(--size-theme-font) * 0.625); @@ -143,22 +143,22 @@ } .portfolio-action { - color: var(--color-theme-accent); + color: var(--color-theme-action); font-size: calc(var(--size-theme-font) * 0.92); } .portfolio-action::before { content: "[ "; - color: var(--color-theme-accent); + color: var(--color-theme-action); } .portfolio-action::after { content: " ]"; - color: var(--color-theme-accent); + color: var(--color-theme-action); } .portfolio-empty { - color: var(--color-theme-muted); + color: var(--color-theme-text-muted); } .portfolio-detail-nav { @@ -173,7 +173,7 @@ } .portfolio-detail-summary { - color: var(--color-theme-foreground); + color: var(--color-theme-text); } .portfolio-detail-section { @@ -196,7 +196,7 @@ } .portfolio-link-url { - color: var(--color-theme-muted); + color: var(--color-theme-text-muted); font-size: calc(var(--size-theme-font) * 0.9); overflow: hidden; text-overflow: ellipsis; diff --git a/src/styles/post.scss b/src/styles/post.scss index 35f3ea1..343c085 100644 --- a/src/styles/post.scss +++ b/src/styles/post.scss @@ -5,7 +5,7 @@ } .framed { - border: calc(var(--size-theme-font) * 0.0625) var(--style-theme-border) var(--color-theme-framed); + border: calc(var(--size-theme-font) * 0.0625) var(--style-theme-border) var(--color-theme-border-emphasis); padding: calc(var(--size-theme-font) * 1.25); } @@ -30,19 +30,19 @@ .post-meta { font-size: calc(var(--size-theme-font) * 0.96); margin-bottom: calc(var(--size-theme-font) * 0.3125); - color: var(--color-theme-meta); + color: var(--color-theme-text-muted); } .post-meta > *:not(:first-child):not(:empty)::before { content: var(--content-theme-post-meta-divider); - color: var(--color-theme-meta); + color: var(--color-theme-text-muted); display: inline-block; margin-right: 1ch; } .post-title { position: relative; - color: var(--color-theme-title); + color: var(--color-theme-heading); margin-top: 0; margin-bottom: calc(var(--size-theme-font) * 0.9375); padding-bottom: calc(var(--size-theme-font) * 0.9375); @@ -68,16 +68,16 @@ bottom: calc(var(--size-theme-font) * 0.01); display: block; width: 100%; - border-bottom: calc(var(--size-theme-font) * 0.125) var(--style-theme-title-divider) var(--color-theme-accent); + border-bottom: calc(var(--size-theme-font) * 0.125) var(--style-theme-title-divider) var(--color-theme-border-accent); } .post-title a { text-decoration: none; - color: var(--color-theme-title); + color: var(--color-theme-heading); } .post-time { - color: var(--color-theme-foreground); + color: var(--color-theme-text); } .post-meta > .post-time { @@ -87,11 +87,11 @@ .post-tags { margin-bottom: calc(var(--size-theme-font) * 0.3125); font-size: inherit; - color: var(--color-theme-tag); + color: var(--color-theme-label); } .post-tag { - color: var(--color-theme-tag); + color: var(--color-theme-label); a { color: inherit; @@ -125,7 +125,7 @@ } .post-body a { - color: var(--color-theme-post-link); + color: var(--color-theme-link); text-decoration: var(--text-decoration-theme-post-link); } @@ -157,7 +157,7 @@ .hanchor { position: absolute; - color: var(--color-theme-accent); + color: var(--color-theme-action); text-decoration: none; margin-left: calc(var(--size-theme-font) * 0.625); visibility: hidden; @@ -173,7 +173,7 @@ h6:hover .hanchor { } .footnotes { - color: var(--color-theme-muted); + color: var(--color-theme-text-muted); } .footnotes hr { diff --git a/src/styles/scheme.scss b/src/styles/scheme.scss index 813bc14..8cf537e 100644 --- a/src/styles/scheme.scss +++ b/src/styles/scheme.scss @@ -2,122 +2,127 @@ :root { --color-theme-background: #f4f4f4; - --color-theme-foreground: #3e3e3e; - --color-theme-accent: #003e8a; - --color-theme-tag: #07962a; - --color-theme-title: #003e8a; - --color-theme-meta: #2e6cba; - --color-theme-framed: #970b16; - --color-theme-menu: #3e3e3e; - --color-theme-header: #3e3e3e; - - --color-theme-code-text: var(--color-theme-foreground); - --color-theme-code-background: var(--color-theme-surface-hover); - --color-theme-link: var(--color-theme-accent); - --color-theme-post-link: var(--color-theme-link); - --color-theme-muted: var(--color-theme-meta); - --color-theme-foreground-muted: color-mix(in srgb, var(--color-theme-foreground) 85%, var(--color-theme-background)); - --color-theme-accent-muted: color-mix(in srgb, var(--color-theme-accent) 60%, var(--color-theme-background)); - --color-theme-accent-subtle: color-mix(in srgb, var(--color-theme-accent) 30%, var(--color-theme-background)); - --color-theme-surface: color-mix(in srgb, var(--color-theme-foreground) 5%, var(--color-theme-background)); - --color-theme-surface-hover: color-mix(in srgb, var(--color-theme-foreground) 10%, var(--color-theme-background)); - --color-theme-border-muted: color-mix(in srgb, var(--color-theme-foreground) 18%, var(--color-theme-background)); - --color-theme-highlight: color-mix(in srgb, var(--color-theme-accent) 45%, var(--color-theme-background)); + --color-theme-text: #3e3e3e; + --color-theme-text-secondary: color-mix(in srgb, var(--color-theme-text) 85%, var(--color-theme-background)); + --color-theme-text-muted: #2e6cba; + --color-theme-text-inverse: var(--color-theme-background); + --color-theme-heading: #003e8a; + --color-theme-label: #07962a; + --color-theme-link: #003e8a; + --color-theme-action: #003e8a; + --color-theme-action-muted: color-mix(in srgb, var(--color-theme-action) 60%, var(--color-theme-background)); + --color-theme-action-subtle: color-mix(in srgb, var(--color-theme-action) 30%, var(--color-theme-background)); + --color-theme-navigation: #3e3e3e; + --color-theme-control: #3e3e3e; + --color-theme-surface: color-mix(in srgb, var(--color-theme-text) 5%, var(--color-theme-background)); + --color-theme-surface-hover: color-mix(in srgb, var(--color-theme-text) 10%, var(--color-theme-background)); + --color-theme-border: var(--color-theme-text); + --color-theme-border-muted: color-mix(in srgb, var(--color-theme-text) 18%, var(--color-theme-background)); + --color-theme-border-accent: var(--color-theme-action); + --color-theme-border-emphasis: #970b16; + --color-theme-selection: color-mix(in srgb, var(--color-theme-action) 45%, var(--color-theme-background)); --color-theme-overlay: rgb(0 0 0 / 80%); - --color-theme-scrollbar: color-mix(in srgb, var(--color-theme-foreground) 45%, var(--color-theme-background)) transparent; + --color-theme-scrollbar: color-mix(in srgb, var(--color-theme-text) 45%, var(--color-theme-background)) transparent; + --color-theme-code-text: var(--color-theme-text); + --color-theme-code-background: var(--color-theme-surface-hover); + --color-theme-caret: #970b16; } html[data-theme-color-scheme] { - --color-theme-tag: var(--color-theme-accent); - --color-theme-title: var(--color-theme-accent); - --color-theme-meta: var(--color-theme-foreground); - --color-theme-framed: var(--color-theme-accent); - --color-theme-menu: var(--color-theme-accent); - --color-theme-header: var(--color-theme-accent); + --color-theme-text-muted: var(--color-theme-text); + --color-theme-heading: var(--color-theme-action); + --color-theme-label: var(--color-theme-action); + --color-theme-link: var(--color-theme-action); + --color-theme-navigation: var(--color-theme-action); + --color-theme-control: var(--color-theme-action); + --color-theme-border-emphasis: var(--color-theme-action); + --color-theme-caret: var(--color-theme-action); } $color-schemes: ( "day": ( "background": #f4f4f4, - "foreground": #3e3e3e, - "accent": #003e8a, - "tag": #07962a, - "meta": #2e6cba, - "framed": #970b16, - "menu": var(--color-theme-foreground), - "header": var(--color-theme-foreground) + "text": #3e3e3e, + "action": #003e8a, + "label": #07962a, + "text-muted": #2e6cba, + "border-emphasis": #970b16, + "caret": #970b16, + "navigation": var(--color-theme-text), + "control": var(--color-theme-text) ), "night": ( "background": #101216, - "foreground": #8b949e, - "accent": #6ca4f8, - "tag": #56d364, - "meta": #6ca4f8, - "framed": #f78166, - "menu": var(--color-theme-foreground), - "header": var(--color-theme-foreground) + "text": #8b949e, + "action": #6ca4f8, + "label": #56d364, + "text-muted": #6ca4f8, + "border-emphasis": #f78166, + "caret": #f78166, + "navigation": var(--color-theme-text), + "control": var(--color-theme-text) ), "niello": ( "background": #1a170f, - "foreground": #eceae5, - "accent": #eec35e + "text": #eceae5, + "action": #eec35e ), "matrix": ( "background": #000000, - "foreground": #4eee85, - "accent": #4eee85 + "text": #4eee85, + "action": #4eee85 ), "ink": ( "background": #121212, - "foreground": #C3C3C3, - "foreground-muted": #C1C1C1, - "accent": #FFFFFF, + "text": #C3C3C3, + "text-secondary": #C1C1C1, + "action": #FFFFFF, "link": #5AC8FA, - "muted": #C1C1C1, + "text-muted": #C1C1C1, "code-text": #FFFFFF, "code-background": #1F1F1F ), "paper": ( "background": #FFFFFF, - "foreground": #1B1B1B, - "foreground-muted": #595959, - "accent": #000000, + "text": #1B1B1B, + "text-secondary": #595959, + "action": #000000, "link": #406ED2, - "muted": #595959, + "text-muted": #595959, "code-text": #1B1B1B, "code-background": #EBEBEB ), "hopbush": ( "background": #fff6f6, - "foreground": #462d2d, - "accent": #cc6099 + "text": #462d2d, + "action": #cc6099 ), "pistachio": ( "background": #1d2021, - "foreground": #ebdbb2, - "accent": #8ec07c + "text": #ebdbb2, + "action": #8ec07c ), "blue": ( "background": #153489, - "foreground": #eceae5, - "accent": #5ea5ee + "text": #eceae5, + "action": #5ea5ee ), "vanilla": ( "background": #fff4f2, - "foreground": #424140, - "accent": #8f6a5e + "text": #424140, + "action": #8f6a5e ), "studio": ( "background": #f7f4ff, - "foreground": #403352, - "accent": #6f49ab + "text": #403352, + "action": #6f49ab ), "blood": ( "background": #221f29, - "foreground": #ffffff, - "accent": #ff6266, - "meta": var(--color-theme-accent), - "menu": var(--color-theme-foreground) + "text": #ffffff, + "action": #ff6266, + "text-muted": var(--color-theme-action), + "navigation": var(--color-theme-text) ) ); @@ -127,7 +132,7 @@ $color-schemes: ( --color-theme-#{$role}: #{$color}; } - @if map.get($scheme-colors, "foreground") == map.get($scheme-colors, "accent") { + @if map.get($scheme-colors, "text") == map.get($scheme-colors, "action") { --text-decoration-theme-post-link: underline; } } diff --git a/src/styles/search.scss b/src/styles/search.scss index 18ebf16..747ccb4 100644 --- a/src/styles/search.scss +++ b/src/styles/search.scss @@ -2,24 +2,24 @@ search-modal { --halo-search-widget-base-font-size: var(--size-theme-font) !important; --halo-search-widget-base-font-family: var(--family-theme-font) !important; --halo-search-widget-base-bg-color: var(--color-theme-background) !important; - --halo-search-widget-primary-color: var(--color-theme-accent) !important; - --halo-search-widget-muted-color: var(--color-theme-muted) !important; - --halo-search-widget-content-color: var(--color-theme-foreground) !important; + --halo-search-widget-primary-color: var(--color-theme-action) !important; + --halo-search-widget-muted-color: var(--color-theme-text-muted) !important; + --halo-search-widget-content-color: var(--color-theme-text) !important; --halo-search-widget-hit-bg-color: var(--color-theme-background) !important; --halo-search-widget-modal-bg-color: var(--color-theme-background) !important; --halo-search-widget-modal-layer-color: var(--color-theme-overlay) !important; --halo-search-widget-divider-color: var(--color-theme-border-muted) !important; - --halo-search-widget-kbd-border-color: var(--color-theme-accent) !important; + --halo-search-widget-kbd-border-color: var(--color-theme-border-accent) !important; --halo-search-widget-kbd-shadow: none !important; --halo-search-widget-color-form-input-bg: var(--color-theme-background) !important; - --halo-search-widget-color-form-input: var(--color-theme-foreground); - --halo-search-widget-color-form-input-placeholder: var(--color-theme-muted) !important; + --halo-search-widget-color-form-input: var(--color-theme-text); + --halo-search-widget-color-form-input-placeholder: var(--color-theme-text-muted) !important; --halo-search-widget-color-form-divider: var(--color-theme-border-muted) !important; - --halo-search-widget-color-result-empty: var(--color-theme-muted) !important; + --halo-search-widget-color-result-empty: var(--color-theme-text-muted) !important; --halo-search-widget-color-result-item-bg: var(--color-theme-background) !important; --halo-search-widget-color-result-item-hover-bg: var(--color-theme-surface-hover) !important; - --halo-search-widget-color-result-item-title: var(--color-theme-accent) !important; - --halo-search-widget-color-result-item-content: var(--color-theme-muted) !important; - --halo-search-widget-color-command-kbd-item: var(--color-theme-accent) !important; - --halo-search-widget-color-command-kbd-borde: var(--color-theme-accent) !important; + --halo-search-widget-color-result-item-title: var(--color-theme-action) !important; + --halo-search-widget-color-result-item-content: var(--color-theme-text-muted) !important; + --halo-search-widget-color-command-kbd-item: var(--color-theme-action) !important; + --halo-search-widget-color-command-kbd-borde: var(--color-theme-border-accent) !important; } diff --git a/src/styles/sns.scss b/src/styles/sns.scss index 2e9860b..af5d8d8 100644 --- a/src/styles/sns.scss +++ b/src/styles/sns.scss @@ -11,7 +11,7 @@ display: inline-flex; align-items: center; justify-content: center; - color: var(--color-theme-foreground); + color: var(--color-theme-text); text-decoration: none; svg { @@ -25,7 +25,7 @@ } .divider { - color: var(--color-theme-foreground); + color: var(--color-theme-text); font-weight: 300; user-select: none; } diff --git a/src/styles/toc.scss b/src/styles/toc.scss index 69f15d6..bfe694b 100644 --- a/src/styles/toc.scss +++ b/src/styles/toc.scss @@ -39,7 +39,7 @@ } &::-webkit-scrollbar-thumb { - background: var(--color-theme-foreground); + background: var(--color-theme-text); &:hover { background: transparent; @@ -62,7 +62,7 @@ .toc-list { margin-left: var(--size-theme-font); - border-left: calc(var(--size-theme-font) * 0.0625) solid var(--color-theme-foreground); + border-left: calc(var(--size-theme-font) * 0.0625) solid var(--color-theme-border); padding-left: calc(var(--size-theme-font) * 0.5); } } @@ -71,18 +71,18 @@ display: block; padding: calc(var(--size-theme-font) * 0.25) calc(var(--size-theme-font) * 0.5); text-decoration: none; - color: var(--color-theme-foreground); + color: var(--color-theme-text); font-size: calc(var(--size-theme-font) * 0.875); &:hover { background: transparent; - color: var(--color-theme-accent); + color: var(--color-theme-action); } &.is-active-link, .is-active-li > & { background: transparent; - color: var(--color-theme-accent); + color: var(--color-theme-action); font-weight: bold; } } @@ -101,7 +101,7 @@ outline: none; background: transparent; border: none; - color: var(--color-theme-foreground); + color: var(--color-theme-text); cursor: pointer; font-size: var(--size-theme-font); z-index: 1002; @@ -115,13 +115,13 @@ body[data-layout-mode='fullscreen'] { .toc.toc-visible { - border: calc(var(--size-theme-font) * 0.0625) solid var(--color-theme-foreground); + border: calc(var(--size-theme-font) * 0.0625) solid var(--color-theme-border); } } @media (max-width: 1400px) { .toc.toc-visible { - border: calc(var(--size-theme-font) * 0.0625) solid var(--color-theme-foreground); + border: calc(var(--size-theme-font) * 0.0625) solid var(--color-theme-border); } } diff --git a/src/styles/typed-text.scss b/src/styles/typed-text.scss index 3dff56d..d7d95bf 100644 --- a/src/styles/typed-text.scss +++ b/src/styles/typed-text.scss @@ -1,5 +1,5 @@ .typed-text { - color: var(--color-theme-framed); + color: var(--color-theme-caret); } .typed-text::after { @@ -14,4 +14,4 @@ to { opacity: 1; } -} \ No newline at end of file +} diff --git a/templates/layout.html b/templates/layout.html index 89b92b5..0216964 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -85,43 +85,59 @@ [# th:each="scheme : ${theme.config.style.custom_color_schemes}"] html[data-theme-color-scheme="[(${scheme.id})]"] { --color-theme-background: [(${scheme.background})]; - --color-theme-foreground: [(${scheme.foreground})]; - --color-theme-accent: [(${scheme.accent})]; + --color-theme-text: [(${#strings.isEmpty(scheme.text) ? scheme.foreground : scheme.text})]; + --color-theme-action: [(${#strings.isEmpty(scheme.action) ? scheme.accent : scheme.action})]; - [# th:if="${not #strings.isEmpty(scheme.tag)}"] - --color-theme-tag: [(${scheme.tag})]; + [# th:if="${not #strings.isEmpty(scheme.text_secondary) or not #strings.isEmpty(scheme.foreground_muted)}"] + --color-theme-text-secondary: [(${#strings.isEmpty(scheme.text_secondary) ? scheme.foreground_muted : scheme.text_secondary})]; [/] - [# th:if="${not #strings.isEmpty(scheme.title)}"] - --color-theme-title: [(${scheme.title})]; + [# th:if="${not #strings.isEmpty(scheme.text_muted) or not #strings.isEmpty(scheme.muted) or not #strings.isEmpty(scheme.meta)}"] + --color-theme-text-muted: [(${not #strings.isEmpty(scheme.text_muted) ? scheme.text_muted : (not #strings.isEmpty(scheme.muted) ? scheme.muted : scheme.meta)})]; [/] - [# th:if="${not #strings.isEmpty(scheme.meta)}"] - --color-theme-meta: [(${scheme.meta})]; + [# th:if="${not #strings.isEmpty(scheme.text_inverse)}"] + --color-theme-text-inverse: [(${scheme.text_inverse})]; [/] - [# th:if="${not #strings.isEmpty(scheme.framed)}"] - --color-theme-framed: [(${scheme.framed})]; + [# th:if="${not #strings.isEmpty(scheme.heading) or not #strings.isEmpty(scheme.title)}"] + --color-theme-heading: [(${#strings.isEmpty(scheme.heading) ? scheme.title : scheme.heading})]; [/] - [# th:if="${not #strings.isEmpty(scheme.menu)}"] - --color-theme-menu: [(${scheme.menu})]; - [/] - - [# th:if="${not #strings.isEmpty(scheme.header)}"] - --color-theme-header: [(${scheme.header})]; - [/] - - [# th:if="${not #strings.isEmpty(scheme.foreground_muted)}"] - --color-theme-foreground-muted: [(${scheme.foreground_muted})]; + [# th:if="${not #strings.isEmpty(scheme.label) or not #strings.isEmpty(scheme.tag)}"] + --color-theme-label: [(${#strings.isEmpty(scheme.label) ? scheme.tag : scheme.label})]; [/] [# th:if="${not #strings.isEmpty(scheme.link)}"] --color-theme-link: [(${scheme.link})]; [/] - [# th:if="${not #strings.isEmpty(scheme.muted)}"] - --color-theme-muted: [(${scheme.muted})]; + [# th:if="${not #strings.isEmpty(scheme.navigation) or not #strings.isEmpty(scheme.menu)}"] + --color-theme-navigation: [(${#strings.isEmpty(scheme.navigation) ? scheme.menu : scheme.navigation})]; + [/] + + [# th:if="${not #strings.isEmpty(scheme.control) or not #strings.isEmpty(scheme.header)}"] + --color-theme-control: [(${#strings.isEmpty(scheme.control) ? scheme.header : scheme.control})]; + [/] + + [# th:if="${not #strings.isEmpty(scheme.border)}"] + --color-theme-border: [(${scheme.border})]; + [/] + + [# th:if="${not #strings.isEmpty(scheme.border_accent)}"] + --color-theme-border-accent: [(${scheme.border_accent})]; + [/] + + [# th:if="${not #strings.isEmpty(scheme.border_emphasis) or not #strings.isEmpty(scheme.framed)}"] + --color-theme-border-emphasis: [(${#strings.isEmpty(scheme.border_emphasis) ? scheme.framed : scheme.border_emphasis})]; + [/] + + [# th:if="${not #strings.isEmpty(scheme.selection)}"] + --color-theme-selection: [(${scheme.selection})]; + [/] + + [# th:if="${not #strings.isEmpty(scheme.caret) or not #strings.isEmpty(scheme.framed)}"] + --color-theme-caret: [(${#strings.isEmpty(scheme.caret) ? scheme.framed : scheme.caret})]; [/] [# th:if="${not #strings.isEmpty(scheme.code_text)}"]