From 959484a1fe48897f8c85067b04446df6d5bf3316 Mon Sep 17 00:00:00 2001 From: kagol Date: Sun, 21 Nov 2021 10:55:01 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0Gitee=E6=8C=82?= =?UTF-8?q?=E4=BB=B6=E5=B9=B6=E4=BC=98=E5=8C=96=E6=B7=B1=E8=89=B2=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=88=87=E6=8D=A2=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devui-theme/components/NavBar.vue | 23 +++++----- .../devui-theme/components/icons/DarkMode.vue | 18 ++++++++ .../components/icons/LightMode.vue | 46 +++++++++++++++++++ 3 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 packages/devui-vue/docs/.vitepress/devui-theme/components/icons/DarkMode.vue create mode 100644 packages/devui-vue/docs/.vitepress/devui-theme/components/icons/LightMode.vue diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue index a1fc7229..1016bef9 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue @@ -1,15 +1,15 @@ @@ -42,18 +40,21 @@ defineEmits(['toggle'])
-
+
-
- - {{ switchText }} +
+ +
-
+
{{defaultLanguage === 'zh-CN' ? '中文' : 'English'}}
+ + star +
diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/DarkMode.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/DarkMode.vue new file mode 100644 index 00000000..469d97cb --- /dev/null +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/DarkMode.vue @@ -0,0 +1,18 @@ + diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/LightMode.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/LightMode.vue new file mode 100644 index 00000000..502e12bc --- /dev/null +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/LightMode.vue @@ -0,0 +1,46 @@ + -- Gitee From 4c70769403af6a32c681389f3fd6fdae3d350349 Mon Sep 17 00:00:00 2001 From: kagol Date: Sun, 21 Nov 2021 12:31:15 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E5=88=87=E6=8D=A2=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devui-theme/components/NavBar.vue | 9 +++++--- .../devui-theme/components/icons/EnLang.vue | 23 +++++++++++++++++++ .../devui-theme/components/icons/ZhLang.vue | 23 +++++++++++++++++++ 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 packages/devui-vue/docs/.vitepress/devui-theme/components/icons/EnLang.vue create mode 100644 packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ZhLang.vue diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue index 1016bef9..22718f14 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue @@ -6,6 +6,8 @@ import NavLinks from './NavLinks.vue' import ToggleSideBarButton from './ToggleSideBarButton.vue' import DarkMode from './icons/DarkMode.vue' import LightMode from './icons/LightMode.vue' +import ZhLang from './icons/ZhLang.vue' +import EnLang from './icons/EnLang.vue' const theme = new Theme('light') @@ -45,13 +47,14 @@ defineEmits(['toggle'])
+
+ + +
-
- {{defaultLanguage === 'zh-CN' ? '中文' : 'English'}} -
star diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/EnLang.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/EnLang.vue new file mode 100644 index 00000000..245b4652 --- /dev/null +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/EnLang.vue @@ -0,0 +1,23 @@ + diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ZhLang.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ZhLang.vue new file mode 100644 index 00000000..8ddd31b9 --- /dev/null +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ZhLang.vue @@ -0,0 +1,23 @@ + -- Gitee From 94ec8ebdb19c36d812dd0fc57a0a2a0d18bd2d6c Mon Sep 17 00:00:00 2001 From: kagol Date: Sun, 21 Nov 2021 13:01:43 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feat:=20=E7=BD=91=E7=AB=99=E6=95=B4?= =?UTF-8?q?=E4=BD=93=E6=A0=B7=E5=BC=8F=E7=BE=8E=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devui-vue/docs/.vitepress/config/enNav.ts | 9 ++++--- .../devui-vue/docs/.vitepress/config/nav.ts | 5 ++-- .../devui-theme/components/NavBar.vue | 24 ++++++++++--------- .../devui-theme/components/NavLink.vue | 2 +- .../components/NextAndPrevLinks.vue | 6 +++-- .../components/icons/ArrowLeft.vue | 17 ++++++++++--- .../components/icons/ArrowRight.vue | 17 ++++++++++--- .../devui-theme/styles/demo-block.scss | 4 ++++ .../.vitepress/devui-theme/styles/layout.scss | 8 +++---- 9 files changed, 60 insertions(+), 32 deletions(-) diff --git a/packages/devui-vue/docs/.vitepress/config/enNav.ts b/packages/devui-vue/docs/.vitepress/config/enNav.ts index 4522ec9b..3ef33ffe 100644 --- a/packages/devui-vue/docs/.vitepress/config/enNav.ts +++ b/packages/devui-vue/docs/.vitepress/config/enNav.ts @@ -1,8 +1,7 @@ const enNav = [ - { text: 'Design disciplines', link: '/en-US/design' }, - { text: 'Component', link: '/en-US/' }, - { text: 'Version history', link: '/en-US/version' }, - { text: 'Theme', link: '/en-US/theme' }, - ] + { text: 'Component', link: '/en-US/' }, + { text: 'Version history', link: 'https://gitee.com/devui/vue-devui/releases' }, + { text: 'Design disciplines', link: 'https://devui.design/design-cn/start' }, +] export default enNav \ No newline at end of file diff --git a/packages/devui-vue/docs/.vitepress/config/nav.ts b/packages/devui-vue/docs/.vitepress/config/nav.ts index 25c08b19..8f723b03 100644 --- a/packages/devui-vue/docs/.vitepress/config/nav.ts +++ b/packages/devui-vue/docs/.vitepress/config/nav.ts @@ -1,8 +1,7 @@ const nav = [ - { text: '设计规范', link: '/design' }, { text: '组件', link: '/' }, - { text: '版本历程', link: '/version' }, - { text: '主题', link: '/theme' }, + { text: '版本历程', link: 'https://gitee.com/devui/vue-devui/releases' }, + { text: '设计规范', link: 'https://devui.design/design-cn/start' }, ] export default nav \ No newline at end of file diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue index 22718f14..0f646370 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue @@ -42,22 +42,24 @@ defineEmits(['toggle'])
-
+
-
- - +
+
+ + +
+
+ + +
+ + star +
-
- - -
- - star -
diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/NavLink.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/NavLink.vue index 734fa330..2cfcac57 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/NavLink.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/NavLink.vue @@ -28,7 +28,7 @@ const { props: linkProps, isExternal } = useNavLink(propsRefs.item) display: block; padding: 0 1.5rem; line-height: 36px; - font-size: 1rem; + font-size: 1rem !important; font-weight: 600; color: $devui-text; white-space: nowrap; diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/NextAndPrevLinks.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/NextAndPrevLinks.vue index e826aca4..13d58522 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/NextAndPrevLinks.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/NextAndPrevLinks.vue @@ -61,6 +61,7 @@ const { hasLinks, prev, next } = useNextAndPrevLinks() max-width: 100%; font-size: 1rem; font-weight: 500; + text-decoration: none; } .text { @@ -77,12 +78,13 @@ const { hasLinks, prev, next } = useNextAndPrevLinks() height: 16px; fill: var(--c-text); transform: translateY(1px); + margin-top: -2px; } .icon-prev { - margin-right: 8px; + margin-right: 6px; } .icon-next { - margin-left: 8px; + margin-left: 6px; } diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ArrowLeft.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ArrowLeft.vue index 3f65b866..58221cca 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ArrowLeft.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ArrowLeft.vue @@ -1,7 +1,18 @@ diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ArrowRight.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ArrowRight.vue index ed89263f..ac675013 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ArrowRight.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ArrowRight.vue @@ -1,7 +1,18 @@ diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss b/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss index facd32f7..382e0aef 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss +++ b/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss @@ -1,5 +1,9 @@ @import '@devui/styles-var/devui-var.scss'; +.theme .page > .container:first-child { + padding: 0 15rem 4rem 3rem !important; +} + .demo-block { border: solid 1px $devui-dividing-line !important; diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/styles/layout.scss b/packages/devui-vue/docs/.vitepress/devui-theme/styles/layout.scss index 2c5b027a..172bcdc5 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/styles/layout.scss +++ b/packages/devui-vue/docs/.vitepress/devui-theme/styles/layout.scss @@ -8,7 +8,7 @@ html { line-height: 1.4; - font-size: 16px; + font-size: 14px; -webkit-text-size-adjust: 100%; } @@ -19,7 +19,7 @@ body { min-height: 100vh; line-height: 1.4; font-family: var(--font-family-base); - font-size: 16px; + font-size: 14px; font-weight: 400; color: $devui-text; background-color: $devui-base-bg; @@ -77,7 +77,7 @@ h1 { @media screen and (min-width: 420px) { h1 { - font-size: 2.2rem; + font-size: 1.8rem; } } @@ -97,7 +97,7 @@ h2 + h3 { h3 { margin-top: 2rem; - font-size: 1.35rem; + font-size: 1.15rem; } h4 { -- Gitee From 4901e413c810d80210afb273774bc1130ac8d606 Mon Sep 17 00:00:00 2001 From: kagol Date: Sun, 21 Nov 2021 13:53:56 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=8F=B3?= =?UTF-8?q?=E4=BE=A7=E5=BF=AB=E9=80=9F=E5=89=8D=E5=BE=80=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docs/.vitepress/devui-theme/components/PageToc.vue | 3 +-- .../docs/.vitepress/devui-theme/styles/demo-block.scss | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/PageToc.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/PageToc.vue index ecd6c29a..32fc5376 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/PageToc.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/PageToc.vue @@ -32,11 +32,10 @@ useActiveSidebarLinks(container, marker) @import '@devui/styles-var/devui-var'; //内容区导航样式 .devui-content-nav { - width: 240px; + width: 200px; position: fixed; top: 50px; right: 0; - height: 90%; z-index: 1; .devui-fast-forward { diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss b/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss index 382e0aef..facd32f7 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss +++ b/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss @@ -1,9 +1,5 @@ @import '@devui/styles-var/devui-var.scss'; -.theme .page > .container:first-child { - padding: 0 15rem 4rem 3rem !important; -} - .demo-block { border: solid 1px $devui-dividing-line !important; -- Gitee From 3246eab18aa7ea375e6eaf0ac294d2932470c961 Mon Sep 17 00:00:00 2001 From: kagol Date: Sun, 21 Nov 2021 14:00:45 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=E6=89=A9=E5=A4=A7BackTop=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=9A=84=E7=82=B9=E5=87=BB=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devui-theme/components/BackToTop.vue | 45 ++++++++++--------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/BackToTop.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/BackToTop.vue index 77ad149f..79b2a4c1 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/BackToTop.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/BackToTop.vue @@ -1,29 +1,32 @@ @@ -77,9 +80,11 @@ export default defineComponent({ .go-to-top { cursor: pointer; position: fixed; + display: flex; bottom: 2rem; right: 2.5rem; width: 2rem; + height: 28px; color: var(--devui-brand); z-index: 1; } -- Gitee From 30cc165cd87abd0675339d36e727fc086ff4445f Mon Sep 17 00:00:00 2001 From: kagol Date: Sun, 21 Nov 2021 14:10:59 +0800 Subject: [PATCH 6/7] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E5=89=8D=E5=BE=80=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docs/.vitepress/devui-theme/components/PageToc.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/PageToc.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/PageToc.vue index 32fc5376..11236979 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/PageToc.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/PageToc.vue @@ -30,6 +30,7 @@ useActiveSidebarLinks(container, marker) diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/DarkMode.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/DarkMode.vue index 469d97cb..6608138f 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/DarkMode.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/DarkMode.vue @@ -8,7 +8,6 @@ p-id="1089" width="18" height="18" - fill="#E8E8E8" > diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ZhLang.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ZhLang.vue index 8ddd31b9..50ff11a0 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ZhLang.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/icons/ZhLang.vue @@ -11,12 +11,10 @@ > -- Gitee