diff --git a/src/styles/common/common.sass b/src/styles/common/common.sass index fa971144..9e582b35 100644 --- a/src/styles/common/common.sass +++ b/src/styles/common/common.sass @@ -1,6 +1,19 @@ -/* 字体 */ +/* 字体定义 */ @import "/appearance/themes/zhi/csslib/webfont.css" $font-family-mono: "JetBrains Mono", "LXGW WenKai", "-apple-system", "Microsoft YaHei", "Times New Roman", "方正北魏楷书_GBK" -/* 颜色 */ -$primary-color: #333 \ No newline at end of file +/* 颜色定义 */ +$body-bg: #f4f4f4 +$main-bg: #fff +$sidebar-bg: hsla(0, 0%, 100%, 0.8) +$blur-bg: hsla(0, 0%, 100%, 0.9) +$custom-block-bg: #f1f1f1 +$text-color: #00323c +$text-lighten-color: #0085ad +$border-color: rgba(0, 0, 0, 0.12) +$code-bg: #f6f6f6 +$code-color: #525252 + +body + --zhi-text-color: #{$text-color} + --zhi-body-bg: #{$body-bg} \ No newline at end of file diff --git a/src/zhi-dark.sass b/src/zhi-dark.sass index dbefcd99..08ec0eca 100644 --- a/src/zhi-dark.sass +++ b/src/zhi-dark.sass @@ -1,3 +1,17 @@ +/* -------------------------------------------------暗黑模式适配--------------------------------------------------- */ html &[data-theme-mode="dark"] - color: #ffffff \ No newline at end of file + $body-bg: #27272b + $main-bg: #1e1e22 + $sidebar-bg: rgba(30, 30, 34, 0.8) + $blur-bg: rgba(30, 30, 34, 0.8) + $custom-block-bg: #27272b + $text-color: #9b9baa + $text-lighten-color: #0085ad + $border-color: #30363d + $code-bg: #252526 + $code-color: #fff + + body + --zhi-text-color: #{$text-color} + --zhi-body-bg: #{$body-bg} \ No newline at end of file diff --git a/src/zhi-green.sass b/src/zhi-green.sass new file mode 100644 index 00000000..2c4a6d88 --- /dev/null +++ b/src/zhi-green.sass @@ -0,0 +1,17 @@ +/* -------------------------------------------------护眼模式适配--------------------------------------------------- */ +html + &[data-theme-mode-zhi="green"] + $body-bg: #ececcc + $main-bg: #f5f5d5 + $sidebar-bg: rgba(245, 245, 213, 0.8) + $blur-bg: rgba(245, 245, 213, 0.9) + $custom-block-bg: #ececcc + $text-color: #704214 + $text-lighten-color: #963 + $border-color: rgba(0, 0, 0, 0.15) + $code-bg: #282c34 + $code-color: #fff + + body + --zhi-text-color: #{$text-color} + --zhi-body-bg: #{$body-bg} \ No newline at end of file diff --git a/src/zhi-light.sass b/src/zhi-light.sass index d8484f07..df7e46c8 100644 --- a/src/zhi-light.sass +++ b/src/zhi-light.sass @@ -1,15 +1,17 @@ +/* -------------------------------------------------浅色模式适配--------------------------------------------------- */ html &[data-theme-mode="light"] - color: red + $body-bg: #f4f4f4 + $main-bg: #fff + $sidebar-bg: hsla(0, 0%, 100%, 0.8) + $blur-bg: hsla(0, 0%, 100%, 0.9) + $custom-block-bg: #f1f1f1 + $text-color: #00323c + $text-lighten-color: #0085ad + $border-color: rgba(0, 0, 0, 0.12) + $code-bg: #f6f6f6 + $code-color: #525252 - body - --bodyBg: #f4f4f4 - --mainBg: #fff - --sidebarBg: hsla(0, 0%, 100%, 0.8) - --blurBg: hsla(0, 0%, 100%, 0.9) - --customBlockBg: #f1f1f1 - --textColor: #00323c - --textLightenColor: #0085ad - --borderColor: rgba(0, 0, 0, 0.12) - --codeBg: #f6f6f6 - --codeColor: #525252 \ No newline at end of file + body + --zhi-text-color: #{$text-color} + --zhi-body-bg: #{$body-bg} \ No newline at end of file diff --git a/src/zhi.sass b/src/zhi.sass index 29b28a33..7956d3bc 100644 --- a/src/zhi.sass +++ b/src/zhi.sass @@ -10,8 +10,20 @@ --b3-font-family-math: var(--b3-font-family) --b3-border-radius-round: 50% +// 整体背景、字体颜色 +body + margin: 0 + padding: 0 + font-family: var(--b3-font-family) + -webkit-font-smoothing: antialiased + -moz-osx-font-smoothing: grayscale + -webkit-tap-highlight-color: transparent + font-size: 16px + color: var(--zhi-text-color) + background: var(--zhi-body-bg) + // 代码块 @import styles/zhi/widgets/code-block -// 浅色、暗黑单独适配 -@import zhi-light, zhi-dark \ No newline at end of file +// 浅色、暗黑、护眼适配 +@import zhi-light, zhi-dark, zhi-green diff --git a/theme.css b/theme.css index 25812143..db61bb60 100644 --- a/theme.css +++ b/theme.css @@ -1,8 +1,12 @@ @charset "UTF-8"; /* 思源笔记启动会自动加载此文件 */ -/* 字体 */ +/* 字体定义 */ @import url(/appearance/themes/zhi/csslib/webfont.css); -/* 颜色 */ +/* 颜色定义 */ +body { + --zhi-text-color: #00323c; + --zhi-body-bg: #f4f4f4; } + :root { --b3-font-family: JetBrains Mono, LXGW WenKai, -apple-system, Microsoft YaHei, Times New Roman, 方正北魏楷书_GBK; --b3-font-family-code: var(--b3-font-family); @@ -11,6 +15,17 @@ --b3-font-family-math: var(--b3-font-family); --b3-border-radius-round: 50%; } +body { + margin: 0; + padding: 0; + font-family: var(--b3-font-family); + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + -webkit-tap-highlight-color: transparent; + font-size: 16px; + color: var(--zhi-text-color); + background: var(--zhi-body-bg); } + /* -------------------------------------------------代码块样式--------------------------------------------------- */ .code-block { border-radius: 1px !important; @@ -86,21 +101,19 @@ code.hljs { color: gray; } /* -------------------------------------------------代码块样式 END--------------------------------------------------- */ -html[data-theme-mode="light"] { - color: red; } -html body { - --bodyBg: #f4f4f4; - --mainBg: #fff; - --sidebarBg: hsla(0, 0%, 100%, 0.8); - --blurBg: hsla(0, 0%, 100%, 0.9); - --customBlockBg: #f1f1f1; - --textColor: #00323c; - --textLightenColor: #0085ad; - --borderColor: rgba(0, 0, 0, 0.12); - --codeBg: #f6f6f6; - --codeColor: #525252; } - -html[data-theme-mode="dark"] { - color: #ffffff; } +/* -------------------------------------------------浅色模式适配--------------------------------------------------- */ +html[data-theme-mode="light"] body { + --zhi-text-color: #00323c; + --zhi-body-bg: #f4f4f4; } + +/* -------------------------------------------------暗黑模式适配--------------------------------------------------- */ +html[data-theme-mode="dark"] body { + --zhi-text-color: #9b9baa; + --zhi-body-bg: #27272b; } + +/* -------------------------------------------------护眼模式适配--------------------------------------------------- */ +html[data-theme-mode-zhi="green"] body { + --zhi-text-color: #704214; + --zhi-body-bg: #ececcc; } /*# sourceMappingURL=theme.css.map */ diff --git a/theme.css.map b/theme.css.map index 9874274f..8fc89517 100644 --- a/theme.css.map +++ b/theme.css.map @@ -1,7 +1,7 @@ { "version": 3, -"mappings": ";;;AACQ,sDAA2C;;ACGnD,KAAM;EACJ,gBAAgB,CAAC,yFAAqB;EACtC,qBAAqB,CAAC,sBAAsB;EAC5C,sBAAsB,CAAC,sBAAsB;EAC7C,sBAAsB,CAAC,sBAAsB;EAC7C,qBAAqB,CAAC,sBAAsB;EAC5C,wBAAwB,CAAC,IAAI;;;ACT/B,WAAW;EACT,aAAa,EAAE,cAAc;EAC7B,oBAAoB,CAAC,QAAQ;EAC7B,MAAM,EAAE,6CAA6C;EACrD,WAAW,EAAE,eAAe;;;AAG9B;yBAAwB;EAEtB,OAAO,EAAE,GAAG;EACZ,WAAW,EAAE,0BAA0B;;;AAGzC,kBAAkB;EAChB,OAAO,EAAE,GAAG;EACZ,QAAQ,EAAE,QAAQ;EAClB,UAAU,EAAE,OAAO;EACnB,UAAU,EAAE,8BAA8B;EAC1C,aAAa,EAAE,6BAA6B;EAC5C,GAAG,EAAE,IAAI;EACT,IAAI,EAAE,GAAG;EACT,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,CAAC;;;AAGZ,yBAAyB;EACvB,UAAU,EAAE,eAAe;EAC3B,OAAO,EAAE,GAAG;EACZ,gBAAgB,EAAE,qCAAqC;EACvD,aAAa,EAAE,GAAG;EAClB,WAAW,EAAE,0BAA0B;EACvC,sBAAsB,EAAE,GAAG;;;AAI7B,sCAAsC;EACpC,KAAK,EAAE,wBAAwB;;;AAIjC;sEAAqE;EAEnE,UAAU,EAAE,CAAC;EACb,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,aAAa,EAAE,GAAG;EAClB,OAAO,EAAE,YAAY;EACrB,WAAW,EAAE,0BAA0B;;AAEzC;6EAA4E;EAE1E,OAAO,EAAE,GAAG;EACZ,WAAW,EAAE,0BAA0B;EACvC,KAAK,EAAE,SAAS;EAChB,OAAO,EAAE,CAAC;;;AAGZ,SAAS;EACP,MAAM,EAAE,iCAAiC;;;AAG3C;;;sEAAyD;EAIvD,OAAO,EAAE,YAAY;EACrB,gBAAgB,EAAE,sBAAsB;;AAE1C;;;0EAA6D;EAI3D,KAAK,EAAE,IAAI;;;ACzEX,6BAA0B;EACxB,KAAK,EAAE,GAAG;AAEZ,SAAI;EACF,QAAQ,CAAC,QAAQ;EACjB,QAAQ,CAAC,KAAK;EACd,WAAW,CAAC,uBAAuB;EACnC,QAAQ,CAAC,uBAAuB;EAChC,eAAe,CAAC,QAAQ;EACxB,WAAW,CAAC,QAAQ;EACpB,kBAAkB,CAAC,QAAQ;EAC3B,aAAa,CAAC,oBAAoB;EAClC,QAAQ,CAAC,QAAQ;EACjB,WAAW,CAAC,QAAQ;;ACbtB,4BAAyB;EACvB,KAAK,EAAE,OAAO", -"sources": ["src/styles/common/common.sass","src/zhi.sass","src/styles/zhi/widgets/code-block.sass","src/zhi-light.sass","src/zhi-dark.sass"], +"mappings": ";;;AACQ,sDAA2C;;AAenD,IAAI;EACF,gBAAgB,CAAC,QAAe;EAChC,aAAa,CAAC,QAAY;;ACd5B,KAAM;EACJ,gBAAgB,CAAC,yFAAqB;EACtC,qBAAqB,CAAC,sBAAsB;EAC5C,sBAAsB,CAAC,sBAAsB;EAC7C,sBAAsB,CAAC,sBAAsB;EAC7C,qBAAqB,CAAC,sBAAsB;EAC5C,wBAAwB,CAAC,IAAI;;AAG/B,IAAI;EACF,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,WAAW,EAAE,qBAAqB;EAClC,sBAAsB,EAAE,WAAW;EACnC,uBAAuB,EAAE,SAAS;EAClC,2BAA2B,EAAE,WAAW;EACxC,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,qBAAqB;EAC5B,UAAU,EAAE,kBAAkB;;;ACrBhC,WAAW;EACT,aAAa,EAAE,cAAc;EAC7B,oBAAoB,CAAC,QAAQ;EAC7B,MAAM,EAAE,6CAA6C;EACrD,WAAW,EAAE,eAAe;;;AAG9B;yBAAwB;EAEtB,OAAO,EAAE,GAAG;EACZ,WAAW,EAAE,0BAA0B;;;AAGzC,kBAAkB;EAChB,OAAO,EAAE,GAAG;EACZ,QAAQ,EAAE,QAAQ;EAClB,UAAU,EAAE,OAAO;EACnB,UAAU,EAAE,8BAA8B;EAC1C,aAAa,EAAE,6BAA6B;EAC5C,GAAG,EAAE,IAAI;EACT,IAAI,EAAE,GAAG;EACT,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,CAAC;;;AAGZ,yBAAyB;EACvB,UAAU,EAAE,eAAe;EAC3B,OAAO,EAAE,GAAG;EACZ,gBAAgB,EAAE,qCAAqC;EACvD,aAAa,EAAE,GAAG;EAClB,WAAW,EAAE,0BAA0B;EACvC,sBAAsB,EAAE,GAAG;;;AAI7B,sCAAsC;EACpC,KAAK,EAAE,wBAAwB;;;AAIjC;sEAAqE;EAEnE,UAAU,EAAE,CAAC;EACb,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,aAAa,EAAE,GAAG;EAClB,OAAO,EAAE,YAAY;EACrB,WAAW,EAAE,0BAA0B;;AAEzC;6EAA4E;EAE1E,OAAO,EAAE,GAAG;EACZ,WAAW,EAAE,0BAA0B;EACvC,KAAK,EAAE,SAAS;EAChB,OAAO,EAAE,CAAC;;;AAGZ,SAAS;EACP,MAAM,EAAE,iCAAiC;;;AAG3C;;;sEAAyD;EAIvD,OAAO,EAAE,YAAY;EACrB,gBAAgB,EAAE,sBAAsB;;AAE1C;;;0EAA6D;EAI3D,KAAK,EAAE,IAAI;;;;AC5DT,kCAAI;EACF,gBAAgB,CAAC,QAAe;EAChC,aAAa,CAAC,QAAY;;;ACF5B,iCAAI;EACF,gBAAgB,CAAC,QAAe;EAChC,aAAa,CAAC,QAAY;;;ACF5B,sCAAI;EACF,gBAAgB,CAAC,QAAe;EAChC,aAAa,CAAC,QAAY", +"sources": ["src/styles/common/common.sass","src/zhi.sass","src/styles/zhi/widgets/code-block.sass","src/zhi-light.sass","src/zhi-dark.sass","src/zhi-green.sass"], "names": [], "file": "theme.css" }