From 9b40330ca36a108acd2a6671df423e9ebe5c7860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A6=E9=82=A6=E9=82=A6=E9=82=A6?= <15622356989@163.com> Date: Fri, 11 Apr 2025 01:18:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/.vitepress/src/api/api-analytics.ts | 2 +- scripts/pre-dev.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/.vitepress/src/api/api-analytics.ts b/app/.vitepress/src/api/api-analytics.ts index a880cae74..917bdc3d5 100644 --- a/app/.vitepress/src/api/api-analytics.ts +++ b/app/.vitepress/src/api/api-analytics.ts @@ -3,5 +3,5 @@ import type { AxiosResponse } from '@/shared/axios'; export function reporAnalytics(params: any) { const url = '/api-dsapi/query/track/openeuler'; - return request.post(url, params).then((res: AxiosResponse) => res.data); + // return request.post(url, params).then((res: AxiosResponse) => res.data); } diff --git a/scripts/pre-dev.js b/scripts/pre-dev.js index bdbb17d02..34c6f8af0 100644 --- a/scripts/pre-dev.js +++ b/scripts/pre-dev.js @@ -118,6 +118,7 @@ if (args.length === 0) { console.error('请提供分支名称'); process.exit(1); } else { + let branchAlias; if (args[1] == 'as' && args.length === 3) { branchAlias = args[2]; } -- Gitee From a030f069aed1f0f1670ce7ce9d56f2e1071bc5cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A6=E9=82=A6=E9=82=A6=E9=82=A6?= <15622356989@163.com> Date: Fri, 18 Apr 2025 16:14:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=A7=86=E8=A7=89?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/.vitepress/src/api/api-analytics.ts | 2 +- app/.vitepress/src/assets/style/markdown.scss | 41 +++++++++++-------- .../src/assets/style/theme/breadcrumb.scss | 5 +++ .../src/assets/style/theme/index.scss | 2 + .../src/assets/style/theme/link.scss | 19 +++++++++ .../src/components/doc/DocBreadCrumb.vue | 6 --- .../src/components/menu/RecursionMenuItem.vue | 12 ++++-- 7 files changed, 60 insertions(+), 27 deletions(-) create mode 100644 app/.vitepress/src/assets/style/theme/breadcrumb.scss create mode 100644 app/.vitepress/src/assets/style/theme/link.scss diff --git a/app/.vitepress/src/api/api-analytics.ts b/app/.vitepress/src/api/api-analytics.ts index 917bdc3d5..a880cae74 100644 --- a/app/.vitepress/src/api/api-analytics.ts +++ b/app/.vitepress/src/api/api-analytics.ts @@ -3,5 +3,5 @@ import type { AxiosResponse } from '@/shared/axios'; export function reporAnalytics(params: any) { const url = '/api-dsapi/query/track/openeuler'; - // return request.post(url, params).then((res: AxiosResponse) => res.data); + return request.post(url, params).then((res: AxiosResponse) => res.data); } diff --git a/app/.vitepress/src/assets/style/markdown.scss b/app/.vitepress/src/assets/style/markdown.scss index 6cbd87b6f..967cbf446 100644 --- a/app/.vitepress/src/assets/style/markdown.scss +++ b/app/.vitepress/src/assets/style/markdown.scss @@ -59,7 +59,7 @@ min-height: auto; @include text1; - &>div *:first-child { + & > div *:first-child { margin-top: 0 !important; } @@ -87,7 +87,7 @@ margin-top: var(--o-gap-2); } - li+li { + li + li { margin-top: 0; } @@ -147,10 +147,15 @@ a { color: var(--o-color-link1); + transition: color var(--o-duration-m1) var(--o-easing-standard-in); @include hover { color: var(--o-color-link2); } + + &:active { + color: var(--o-color-link3); + } } img { @@ -184,7 +189,7 @@ } code .diff.remove { - background-color: rgba(244, 63, 94, .14); + background-color: rgba(244, 63, 94, 0.14); opacity: 0.8; } @@ -194,7 +199,7 @@ } code .diff.add { - background-color: rgba(16, 185, 129, .14); + background-color: rgba(16, 185, 129, 0.14); } code .diff.add::before { @@ -203,21 +208,23 @@ } code .highlighted { - background-color: rgba(142, 150, 170, .14); + background-color: rgba(142, 150, 170, 0.14); } code .highlighted.error { - background-color: rgba(244, 63, 94, .14); + background-color: rgba(244, 63, 94, 0.14); } code .highlighted.warning { - background-color: rgba(234, 179, 8, .14); + background-color: rgba(234, 179, 8, 0.14); } .has-focused-lines .line:not(.has-focus) { - opacity: .8; - transition: filter .35s, opacity .35s; - filter: blur(.095rem); + opacity: 0.8; + transition: + filter 0.35s, + opacity 0.35s; + filter: blur(0.095rem); } p code:first-child { @@ -257,10 +264,10 @@ border: 1px solid var(--o-color-control4); } - >*:last-child { + > *:last-child { margin-bottom: 0; - - >*:last-child { + + > *:last-child { margin-bottom: 0; } } @@ -349,7 +356,7 @@ margin-bottom: 0; } - *+* { + * + * { margin-top: var(--o-gap-2); } @@ -467,7 +474,7 @@ } } - >*:not(.custom-block-title) { + > *:not(.custom-block-title) { margin-left: 32px; @include respond-to('laptop') { @@ -487,7 +494,7 @@ } } - >*:not(.custom-block-title):last-child { + > *:not(.custom-block-title):last-child { margin-bottom: 0; } @@ -531,4 +538,4 @@ background-image: url('@/assets/category/docs/icon-copy-dark.svg'); } } -} \ No newline at end of file +} diff --git a/app/.vitepress/src/assets/style/theme/breadcrumb.scss b/app/.vitepress/src/assets/style/theme/breadcrumb.scss new file mode 100644 index 000000000..4e2f6271f --- /dev/null +++ b/app/.vitepress/src/assets/style/theme/breadcrumb.scss @@ -0,0 +1,5 @@ +.o-breadcrumb { + --breadcrumb-color-hover: var(--o-color-primary1); + --breadcrumb-color-active: var(--o-color-primary1); + --breadcrumb-color-selected: var(--o-color-primary1); +} diff --git a/app/.vitepress/src/assets/style/theme/index.scss b/app/.vitepress/src/assets/style/theme/index.scss index b0555a333..424bea698 100644 --- a/app/.vitepress/src/assets/style/theme/index.scss +++ b/app/.vitepress/src/assets/style/theme/index.scss @@ -13,3 +13,5 @@ @use './rate.scss' as *; @use './result.scss' as *; @use './textarea.scss' as *; +@use './link.scss' as *; +@use './breadcrumb.scss' as *; diff --git a/app/.vitepress/src/assets/style/theme/link.scss b/app/.vitepress/src/assets/style/theme/link.scss new file mode 100644 index 000000000..81e9b182a --- /dev/null +++ b/app/.vitepress/src/assets/style/theme/link.scss @@ -0,0 +1,19 @@ +@use '../mixin/screen.scss' as *; + +.o-link { + --link-underline-color: var(--link-color-hover); +} + +.o-link:active { + --link-underline-color: var(--link-color-active); +} + +.o-link.o-link-hover-underline .o-link-label { + background: linear-gradient(0deg, var(--link-underline-color), var(--link-underline-color)) no-repeat var(--link-underline-x) bottom; + background-size: 0 1px; + + @include hover { + background-size: var(--link-underline-x) 1px; + background-position-x: left; + } +} diff --git a/app/.vitepress/src/components/doc/DocBreadCrumb.vue b/app/.vitepress/src/components/doc/DocBreadCrumb.vue index 6a0ce194b..8440c5765 100644 --- a/app/.vitepress/src/components/doc/DocBreadCrumb.vue +++ b/app/.vitepress/src/components/doc/DocBreadCrumb.vue @@ -61,11 +61,5 @@ const goToPage = (href: string) => { @include respond-to('<=laptop') { height: 18px; } - - .o-breadcrumb { - --breadcrumb-color-hover: var(--o-color-primary1); - --breadcrumb-color-active: var(--o-color-primary1); - --breadcrumb-color-selected: var(--o-color-primary1); - } } diff --git a/app/.vitepress/src/components/menu/RecursionMenuItem.vue b/app/.vitepress/src/components/menu/RecursionMenuItem.vue index 7a3ed69b8..9a762d71b 100644 --- a/app/.vitepress/src/components/menu/RecursionMenuItem.vue +++ b/app/.vitepress/src/components/menu/RecursionMenuItem.vue @@ -1,6 +1,8 @@