From 0fe2122d8518b7eacec15d788ae80b3c07ed9d78 Mon Sep 17 00:00:00 2001 From: shenjunjian <40288193@qq.com> Date: Sun, 2 Mar 2025 22:53:49 -0800 Subject: [PATCH 1/5] fix(site): remove switch theme button --- examples/sites/src/views/layout/layout.vue | 8 -------- 1 file changed, 8 deletions(-) diff --git a/examples/sites/src/views/layout/layout.vue b/examples/sites/src/views/layout/layout.vue index 0972db3a89..fab939cfd8 100644 --- a/examples/sites/src/views/layout/layout.vue +++ b/examples/sites/src/views/layout/layout.vue @@ -2,9 +2,6 @@
-
- {{ isDark ? 'dark' : 'light' }} -
`${import.meta.env.VITE_CONTEXT}${allPath}${lang}/${theme}/${route}${key}` const isThemeSaas = import.meta.env.VITE_TINY_THEME === 'saas' - const isDark = useDark() - const toggleDark = useToggle(isDark) const changeLanguage = () => { appFn.toggleLang() @@ -197,8 +191,6 @@ export default defineComponent({ getWord, i18nByKey, isThemeSaas, - isDark, - toggleDark, isShowFilter } } From bf6472a2d7684cd874bfd3df9a18c31bb8434f7f Mon Sep 17 00:00:00 2001 From: shenjunjian <40288193@qq.com> Date: Mon, 3 Mar 2025 01:13:36 -0800 Subject: [PATCH 2/5] fix(site): fix some wrong colors --- examples/sites/src/assets/custom-markdown.css | 23 ++++++++++++++++++ .../directives-custom-instruction.svg | 16 ++----------- examples/sites/src/assets/markdown.less | 24 ------------------- examples/sites/src/main.js | 3 +-- .../views/components-doc/components/demo.vue | 15 ++++++++---- examples/sites/src/views/docs/docs.vue | 17 ------------- 6 files changed, 37 insertions(+), 61 deletions(-) delete mode 100644 examples/sites/src/assets/markdown.less diff --git a/examples/sites/src/assets/custom-markdown.css b/examples/sites/src/assets/custom-markdown.css index 9062b85b1b..ed63fb5f9d 100644 --- a/examples/sites/src/assets/custom-markdown.css +++ b/examples/sites/src/assets/custom-markdown.css @@ -95,3 +95,26 @@ body .markdown-body { --color-attention-subtle: #fff8c5; --color-danger-fg: #cf222e; } +.markdown-body code { + text-shadow: none !important; +} + +.dark.dark .markdown-body { + background-color: #000; +} + +.dark.dark .markdown-body pre { + background-color: #1a1a1a; +} + +.dark.dark .markdown-body code { + color: var(--tv-color-text); + + .token.operator { + background-color: transparent; + } + + .hljs-string { + color: #6f42c1; + } +} diff --git a/examples/sites/src/assets/images/leftMenu/directives-custom-instruction.svg b/examples/sites/src/assets/images/leftMenu/directives-custom-instruction.svg index 1e9eacf77c..f71c25e0c4 100644 --- a/examples/sites/src/assets/images/leftMenu/directives-custom-instruction.svg +++ b/examples/sites/src/assets/images/leftMenu/directives-custom-instruction.svg @@ -1,16 +1,4 @@ - 编组 43 - - - - - - - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/examples/sites/src/assets/markdown.less b/examples/sites/src/assets/markdown.less deleted file mode 100644 index 8e3bab50bf..0000000000 --- a/examples/sites/src/assets/markdown.less +++ /dev/null @@ -1,24 +0,0 @@ - .tiny-huicharts { - pre { - code { - font-size: 14px; - max-width: initial; - overflow: initial; - line-height: 2; - word-wrap: normal; - display: block; - overflow-x: auto; - padding: 0.5rem 1rem; - margin-bottom: 1rem; - color: #dd4a68; - - &>.hljs-number { - color: blue; - } - - &>.hljs-string { - color: green; - } - } - } - } \ No newline at end of file diff --git a/examples/sites/src/main.js b/examples/sites/src/main.js index 372ce10489..2524956934 100644 --- a/examples/sites/src/main.js +++ b/examples/sites/src/main.js @@ -7,7 +7,7 @@ import 'prismjs/themes/prism.css' import 'uno.css' // highlight默认样式 -import 'highlight.js/styles/default.css' +// import 'highlight.js/styles/default.css' // 只使用markdown的亮色主题 import 'github-markdown-css/github-markdown.css' @@ -17,7 +17,6 @@ import './style.css' // 覆盖默认的github markdown样式 import './assets/custom-markdown.css' import './assets/custom-block.less' -import './assets/markdown.less' import './assets/md-preview.less' import { i18n } from './i18n/index' diff --git a/examples/sites/src/views/components-doc/components/demo.vue b/examples/sites/src/views/components-doc/components/demo.vue index 432b8e3120..b806eae68a 100644 --- a/examples/sites/src/views/components-doc/components/demo.vue +++ b/examples/sites/src/views/components-doc/components/demo.vue @@ -335,10 +335,6 @@ onBeforeUnmount(() => { } } -:global(.dark .pc-demo-container.pc-demo-container) { - background-color: #1a1a1a; - border: none; -} .pc-demo-container { display: flex; flex-direction: column; @@ -400,3 +396,14 @@ onBeforeUnmount(() => { padding: 20px 5px; } + + diff --git a/examples/sites/src/views/docs/docs.vue b/examples/sites/src/views/docs/docs.vue index fc2c4b33a3..738692d029 100644 --- a/examples/sites/src/views/docs/docs.vue +++ b/examples/sites/src/views/docs/docs.vue @@ -67,23 +67,6 @@ onMounted(() => { } } -.dark .docs-container .markdown-body { - background-color: #000; -} - -.dark .docs-container .markdown-body pre { - background-color: #1a1a1a; -} - -.dark .docs-container .markdown-body code { - text-shadow: none; - color: var(--tv-color-text); - - .token.operator { - background-color: transparent; - } -} - .docs-page-anchor { .tiny-anchor__affix { overflow-y: auto; From 1799218c8eed8b3ff759b9ca54d6f3f326ccfb72 Mon Sep 17 00:00:00 2001 From: shenjunjian <40288193@qq.com> Date: Mon, 3 Mar 2025 02:10:19 -0800 Subject: [PATCH 3/5] fix(site): add { allowDarkTheme:true } to TDCommon --- examples/sites/src/App.vue | 1 + examples/sites/src/views/components-doc/common.vue | 2 +- examples/sites/src/views/docs/docs.vue | 2 +- examples/sites/src/views/overview.vue | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/sites/src/App.vue b/examples/sites/src/App.vue index 231b73a998..bd1eb03827 100644 --- a/examples/sites/src/App.vue +++ b/examples/sites/src/App.vue @@ -31,6 +31,7 @@ export default defineComponent({ onMounted(() => { // 加载header const common = new window.TDCommon(['#header'], { + allowDarkTheme: true, searchConfig: { show: true }, diff --git a/examples/sites/src/views/components-doc/common.vue b/examples/sites/src/views/components-doc/common.vue index a1ffeb6fb9..375b4ba70e 100644 --- a/examples/sites/src/views/components-doc/common.vue +++ b/examples/sites/src/views/components-doc/common.vue @@ -162,7 +162,7 @@ watch( onMounted(() => { loadPage() // 加载公共尾部 - const common = new window.TDCommon(['#footer'], {}) + const common = new window.TDCmmon(['#footer'], { allowDarkTheme: true }) common.renderFooter() setScrollListener() }) diff --git a/examples/sites/src/views/docs/docs.vue b/examples/sites/src/views/docs/docs.vue index 738692d029..741b6e42db 100644 --- a/examples/sites/src/views/docs/docs.vue +++ b/examples/sites/src/views/docs/docs.vue @@ -48,7 +48,7 @@ watch([() => router.currentRoute.value, () => router.currentRoute.value.params.d onMounted(() => { loadPage() - const common = new window.TDCommon(['#footer'], {}) + const common = new window.TDCommon(['#footer'], { allowDarkTheme: true }) common.renderFooter() }) diff --git a/examples/sites/src/views/overview.vue b/examples/sites/src/views/overview.vue index 75e0886739..8fb0c52314 100644 --- a/examples/sites/src/views/overview.vue +++ b/examples/sites/src/views/overview.vue @@ -159,7 +159,7 @@ export default defineComponent({ } onMounted(() => { - const common = new window.TDCommon(['#footer'], {}) + const common = new window.TDCommon(['#footer'], { allowDarkTheme: true }) common.renderFooter() }) return { ...toRefs(state), ...fn, TinyInput, noDataSvg, searchSvg, isZhCn, getWord, i18nByKey, pubUrl } From 3677496fdda2e624c065e5ee914bcc1c7f7b2b09 Mon Sep 17 00:00:00 2001 From: shenjunjian <40288193@qq.com> Date: Mon, 3 Mar 2025 02:23:11 -0800 Subject: [PATCH 4/5] fix(site): add mock button for switch theme --- examples/sites/public/static/js/design-common.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/examples/sites/public/static/js/design-common.js b/examples/sites/public/static/js/design-common.js index 816f62d7fb..90447271e6 100644 --- a/examples/sites/public/static/js/design-common.js +++ b/examples/sites/public/static/js/design-common.js @@ -27,6 +27,7 @@ const headerHtml = ` TinyVue
+
` @@ -147,6 +148,10 @@ class DesignCommon { link.href = '/static/css/design-common.css' link.rel = 'stylesheet' document.head.append(link) + + document.getElementById('switchTheme').addEventListener('click', () => { + document.querySelector('html').classList.toggle('dark') + }) } renderFooter() { document.getElementById('footer').innerHTML = footerHtml From af9383cc4604d678a458b2d3bac70c6b03143ba1 Mon Sep 17 00:00:00 2001 From: shenjunjian <40288193@qq.com> Date: Mon, 3 Mar 2025 18:28:00 -0800 Subject: [PATCH 5/5] fix(site): fix reviews --- examples/sites/src/main.js | 3 --- examples/sites/src/views/components-doc/common.vue | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/examples/sites/src/main.js b/examples/sites/src/main.js index 2524956934..119381ca52 100644 --- a/examples/sites/src/main.js +++ b/examples/sites/src/main.js @@ -6,9 +6,6 @@ import '@unocss/reset/eric-meyer.css' import 'prismjs/themes/prism.css' import 'uno.css' -// highlight默认样式 -// import 'highlight.js/styles/default.css' - // 只使用markdown的亮色主题 import 'github-markdown-css/github-markdown.css' import './assets/index.less' diff --git a/examples/sites/src/views/components-doc/common.vue b/examples/sites/src/views/components-doc/common.vue index 375b4ba70e..80f80ed320 100644 --- a/examples/sites/src/views/components-doc/common.vue +++ b/examples/sites/src/views/components-doc/common.vue @@ -162,7 +162,7 @@ watch( onMounted(() => { loadPage() // 加载公共尾部 - const common = new window.TDCmmon(['#footer'], { allowDarkTheme: true }) + const common = new window.TDCommon(['#footer'], { allowDarkTheme: true }) common.renderFooter() setScrollListener() })