diff --git a/Yi.Ai.Vue3/src/components/MarkedMarkdown/index.vue b/Yi.Ai.Vue3/src/components/MarkedMarkdown/index.vue index 6d0a078b..941aa460 100644 --- a/Yi.Ai.Vue3/src/components/MarkedMarkdown/index.vue +++ b/Yi.Ai.Vue3/src/components/MarkedMarkdown/index.vue @@ -297,95 +297,6 @@ onUnmounted(() => { line-height: 1.7; word-wrap: break-word; overflow-wrap: break-word; - - // 深色主题 - &.theme-dark { - color: #e6edf3; - - a { - color: #58a6ff; - &:hover { - text-decoration: underline; - } - } - - h1, h2, h3, h4, h5, h6 { - color: #e6edf3; - border-bottom-color: #30363d; - } - - hr { - background-color: #30363d; - } - - blockquote { - color: #8b949e; - border-left-color: #3b434b; - } - - code.inline-code { - background-color: rgba(110, 118, 129, 0.4); - color: #e6edf3; - } - - .code-block-wrapper { - background-color: #161b22; - border: 1px solid #30363d; - - .code-block-header { - background-color: #21262d; - border-bottom-color: #30363d; - - .code-lang { - color: #8b949e; - } - - .copy-btn, - .preview-btn { - color: #8b949e; - &:hover { - color: #e6edf3; - background-color: #30363d; - } - &.copied { - color: #3fb950; - } - } - } - - .code-block-body { - .line-numbers { - background-color: #161b22; - border-right: 1px solid #30363d; - - .line-number { - color: #6e7681; - } - } - } - - pre.hljs { - background-color: #161b22; - } - } - - table { - th { - background-color: #21262d; - } - td, th { - border-color: #30363d; - } - tr:nth-child(2n) { - background-color: #161b22; - } - } - - .markdown-image { - background-color: transparent; - } - } - // 浅色主题 &.theme-light { color: #24292f; diff --git a/Yi.Ai.Vue3/src/styles/atom-one-dark.css b/Yi.Ai.Vue3/src/styles/atom-one-dark.css index 1616aafe..074a6ed7 100644 --- a/Yi.Ai.Vue3/src/styles/atom-one-dark.css +++ b/Yi.Ai.Vue3/src/styles/atom-one-dark.css @@ -17,80 +17,82 @@ hue-6: #d19a66 hue-6-2: #e6c07b */ +[data-theme="dark"]{ + .hljs { + display: block; + overflow-x: auto; + padding: 0.5em; + color: #abb2bf; + background: #282c34; + } -.hljs { - display: block; - overflow-x: auto; - padding: 0.5em; - color: #abb2bf; - background: #282c34; -} + .hljs-comment, + .hljs-quote { + color: #5c6370; + font-style: italic; + } -.hljs-comment, -.hljs-quote { - color: #5c6370; - font-style: italic; -} + .hljs-doctag, + .hljs-keyword, + .hljs-formula { + color: #c678dd; + } -.hljs-doctag, -.hljs-keyword, -.hljs-formula { - color: #c678dd; -} + .hljs-section, + .hljs-name, + .hljs-selector-tag, + .hljs-deletion, + .hljs-subst { + color: #e06c75; + } -.hljs-section, -.hljs-name, -.hljs-selector-tag, -.hljs-deletion, -.hljs-subst { - color: #e06c75; -} + .hljs-literal { + color: #56b6c2; + } -.hljs-literal { - color: #56b6c2; -} + .hljs-string, + .hljs-regexp, + .hljs-addition, + .hljs-attribute, + .hljs-meta-string { + color: #98c379; + } -.hljs-string, -.hljs-regexp, -.hljs-addition, -.hljs-attribute, -.hljs-meta-string { - color: #98c379; -} + .hljs-built_in, + .hljs-class .hljs-title { + color: #e6c07b; + } -.hljs-built_in, -.hljs-class .hljs-title { - color: #e6c07b; -} + .hljs-attr, + .hljs-variable, + .hljs-template-variable, + .hljs-type, + .hljs-selector-class, + .hljs-selector-attr, + .hljs-selector-pseudo, + .hljs-number { + color: #d19a66; + } -.hljs-attr, -.hljs-variable, -.hljs-template-variable, -.hljs-type, -.hljs-selector-class, -.hljs-selector-attr, -.hljs-selector-pseudo, -.hljs-number { - color: #d19a66; -} + .hljs-symbol, + .hljs-bullet, + .hljs-link, + .hljs-meta, + .hljs-selector-id, + .hljs-title { + color: #61aeee; + } -.hljs-symbol, -.hljs-bullet, -.hljs-link, -.hljs-meta, -.hljs-selector-id, -.hljs-title { - color: #61aeee; -} + .hljs-emphasis { + font-style: italic; + } -.hljs-emphasis { - font-style: italic; -} + .hljs-strong { + font-weight: bold; + } -.hljs-strong { - font-weight: bold; -} + .hljs-link { + text-decoration: underline; + } -.hljs-link { - text-decoration: underline; } diff --git a/Yi.Ai.Vue3/src/styles/dark-theme.scss b/Yi.Ai.Vue3/src/styles/dark-theme.scss index 91dcd67d..a0b40dde 100644 --- a/Yi.Ai.Vue3/src/styles/dark-theme.scss +++ b/Yi.Ai.Vue3/src/styles/dark-theme.scss @@ -528,7 +528,7 @@ /* 代码块 */ pre, code { - background-color: var(--bg-color-tertiary) !important; + background-color: #1D1E1F !important; } /* Markdown 样式 */ @@ -1806,7 +1806,4 @@ .marked-markdown.theme-light .code-block-wrapper .code-block-body .line-numbers{ @include dark-theme-div; } - } - -