From 90cae7ec2518dd55523119c1a528b2432ad40219 Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 26 Aug 2026 21:44:46 +0800 Subject: [PATCH] docs: reuse shared theme styles from doc-ui --- pnpm-lock.yaml | 10 ++-- pnpm-workspace.yaml | 3 +- website/package.json | 2 +- website/theme/components/Features.tsx | 4 +- website/theme/index.scss | 2 - website/theme/index.tsx | 3 +- website/theme/theme.scss | 71 --------------------------- 7 files changed, 11 insertions(+), 84 deletions(-) delete mode 100644 website/theme/theme.scss diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 07287cda..c19a9a89 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -34,7 +34,7 @@ catalogs: '@rspress/plugin-sitemap': specifier: ^2.0.20 version: 2.0.20 - '@rstack-dev/doc-ui': + '@rstackjs/doc-ui': specifier: 1.14.8 version: 1.14.8 '@rstackjs/create-toolkit': @@ -458,7 +458,7 @@ importers: '@rspress/plugin-sitemap': specifier: 'catalog:' version: 2.0.20(@rspress/core@2.0.20) - '@rstack-dev/doc-ui': + '@rstackjs/doc-ui': specifier: 'catalog:' version: 1.14.8(@rspress/core@2.0.20) '@shikijs/transformers': @@ -1580,8 +1580,8 @@ packages: '@rspress/shared@2.0.20': resolution: {integrity: sha512-+e55crMZom5BQLgebrT4Pz4Zg0P7JIsYnDz4Ey65CTloFhfan1rARQpgb74b2bf5kKv/sPbPw6pfD8Fu74mCPQ==} - '@rstack-dev/doc-ui@1.14.8': - resolution: {integrity: sha512-CAibkpvCnJEcxsypu3ZE9JjtQw+1+iJGv9X09Yg4//9FevHpfaHW+b2onFG+Z/xOlUXGg83rJTb7CO6YbToP0w==} + '@rstackjs/doc-ui@1.14.8': + resolution: {integrity: sha512-i8FB+NrnCVKIPz4cbXe/oOebcHuIUe2DQTpKxCXUBqgM9QL66+LZ5UtgZPExalTDpUPzhwOhsXKfkstGB0JkVg==} peerDependencies: '@rspress/core': '>=2.0.0' peerDependenciesMeta: @@ -4174,7 +4174,7 @@ snapshots: - core-js - supports-color - '@rstack-dev/doc-ui@1.14.8(@rspress/core@2.0.20)': + '@rstackjs/doc-ui@1.14.8(@rspress/core@2.0.20)': optionalDependencies: '@rspress/core': 2.0.20(micromark-util-types@2.0.2)(micromark@4.0.2)(supports-color@8.1.1) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 328922b2..247c06ec 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -21,7 +21,7 @@ catalog: '@rspress/core': '^2.0.20' '@rspress/plugin-client-redirects': '^2.0.20' '@rspress/plugin-sitemap': '^2.0.20' - '@rstack-dev/doc-ui': '1.14.8' + '@rstackjs/doc-ui': '1.14.8' '@rstackjs/create-toolkit': '2.2.4' '@rstackjs/load-config': ^0.1.2 '@rstackjs/test-utils': ^0.2.0 @@ -94,7 +94,6 @@ minimumReleaseAgeExclude: - '@rslint/*' - '@rstackjs/*' - 'rslog' - - '@rstack-dev/doc-ui' - 'rsbuild-plugin-*' - '@swc/*' - 'heading-case' diff --git a/website/package.json b/website/package.json index bb4a5f6b..192e2e47 100644 --- a/website/package.json +++ b/website/package.json @@ -13,7 +13,7 @@ "@rspress/core": "catalog:", "@rspress/plugin-client-redirects": "catalog:", "@rspress/plugin-sitemap": "catalog:", - "@rstack-dev/doc-ui": "catalog:", + "@rstackjs/doc-ui": "catalog:", "@shikijs/transformers": "catalog:", "@types/node": "catalog:", "@types/react": "catalog:", diff --git a/website/theme/components/Features.tsx b/website/theme/components/Features.tsx index cd5fd54d..b45d5b7a 100644 --- a/website/theme/components/Features.tsx +++ b/website/theme/components/Features.tsx @@ -3,11 +3,11 @@ import { Link } from '@rspress/core/theme-original'; import { containerStyle, innerContainerStyle, -} from '@rstack-dev/doc-ui/section-style'; +} from '@rstackjs/doc-ui/section-style'; import { type Feature, WhyRspack as BaseFeatures, -} from '@rstack-dev/doc-ui/why-rspack'; +} from '@rstackjs/doc-ui/why-rspack'; import { memo, useMemo } from 'react'; import CompatibleJson from './Features/assets/Compatible.json'; import Compatible from './Features/assets/Compatible.svg'; diff --git a/website/theme/index.scss b/website/theme/index.scss index 9a0c9c56..424f4dba 100644 --- a/website/theme/index.scss +++ b/website/theme/index.scss @@ -1,5 +1,3 @@ -@import './theme.scss'; - /* Keep document content visually centered when a page has no sidebar. */ @media (min-width: 1280px) { .rp-doc-layout__sidebar-placeholder { diff --git a/website/theme/index.tsx b/website/theme/index.tsx index 82cee730..d9f07d14 100644 --- a/website/theme/index.tsx +++ b/website/theme/index.tsx @@ -1,6 +1,7 @@ import { Layout as BaseLayout } from '@rspress/core/theme-original'; -import { NavIcon } from '@rstack-dev/doc-ui/nav-icon'; +import { NavIcon } from '@rstackjs/doc-ui/nav-icon'; import { HomeLayout } from './pages'; +import '@rstackjs/doc-ui/theme.css'; import './index.scss'; const Layout = () => } />; diff --git a/website/theme/theme.scss b/website/theme/theme.scss deleted file mode 100644 index 4ead7477..00000000 --- a/website/theme/theme.scss +++ /dev/null @@ -1,71 +0,0 @@ -:root { - --rp-c-brand: #ff5e00; - --rp-c-brand-dark: var(--rp-c-brand); - --rp-c-brand-darker: #ff704d; - --rp-c-brand-light: #ff7524; - --rp-c-brand-lighter: #ff7524; - --rp-c-brand-tint: rgba(255, 94, 0, 0.07); - --rp-c-text-code: var(--rp-c-text-1); -} - -.dark { - --rp-c-link: var(--rp-c-brand-light); -} - -html:not(.dark) { - --rp-c-text-2: #666; -} - -.rp-sidebar-item:hover, -.rp-sidebar-item--active, -.rp-sidebar-item--active:hover { - color: var(--rp-c-text-0); - background-color: var(--rp-c-bg-mute); -} - -.dark { - .rp-sidebar-item:hover, - .rp-sidebar-item--active, - .rp-sidebar-item--active:hover { - background-color: #1f1f1f; - } -} - -.rp-toc-item__text, -.rp-toc-item__text code { - color: var(--rp-c-text-2); -} - -.rp-toc-item--active .rp-toc-item__text, -.rp-toc-item--active .rp-toc-item__text code { - color: var(--rp-c-text-0); - font-weight: 500; -} - -.rp-doc { - .rp-link, - .rp-link code { - color: inherit; - text-decoration-line: underline; - text-underline-offset: 2px; - text-decoration-color: rgba(0, 0, 0, 0.25); - - &:hover { - opacity: 1; - text-decoration-color: currentColor; - border-bottom: none !important; - } - } -} - -.dark { - .rp-doc { - .rp-link { - text-decoration-color: rgba(255, 255, 255, 0.5); - - &:hover { - text-decoration-color: currentColor; - } - } - } -}