diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d6fd46d..f5f7021 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -95,8 +95,8 @@ npm run commit 请在颜色主题文件头部附加自己的作者信息, 方便 Issue 提问者找到你 `@`. -推荐使用 `import { defineTheme, type ThemeColor } from "src"` 导入主题生成框架, 声明主题颜色, 然后使用 `defineTheme` 函数生成主题所有 CSS 变量, -defineTheme 中设置了一些经过计算得到的 Gitea 变量可以减少工作量, 具体请查看函数说明和定义. +推荐使用 `import { defineTheme, type ThemeColor } from "src"` 导入主题生成框架, 声明主题颜色, 然后使用 `defineTheme` +函数生成主题所有 CSS 变量, defineTheme 中设置了一些经过计算得到的 Gitea 变量可以减少工作量, 具体请查看函数说明和定义. 颜色计算函数可以从 `src/functions` 导入, 例如 `import { scaleColorLight } from "src/functions"`, 或者使用 `polished` 库. diff --git a/README.md b/README.md index 0769b61..22b5691 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ THEMES = gitea-auto, gitea-light, gitea-dark, github-auto, github-light, github- ```ini THEMES = github-auto, github-light, github-dark, github-soft-dark ``` +
Base

theme-github-light.css

@@ -103,7 +104,7 @@ THEMES = github-tritanopia-auto, github-tritanopia-light, github-tritanopia-dark | 变量名 | 描述 | 默认 | Github | 推荐 | 最小 | 最大 | | :-------------------------------- | :-------------------------- | :---- | :----- | :---- | :---- | :---- | -| --custom-clone-menu-width | 克隆菜单宽度 | Gitea | 332px | 200px | 150px | 400px | +| --custom-clone-menu-width | 克隆按钮的菜单宽度 | Gitea | 332px | 200px | 150px | 400px | | --custom-explore-repolist-columns | 探索页面的仓库列表列数 | 2 | 2 | 2 | | | | --custom-explore-userlist-columns | 探索页面的用户/组织列表列数 | 3 | 1 | 2/3 | | | | --custom-user-repolist-columns | 用户页面的仓库列表列数 | 2 | 2 | 1/2 | | | diff --git a/src/core/color.ts b/src/core/color.ts index c61613d..991c15f 100644 --- a/src/core/color.ts +++ b/src/core/color.ts @@ -165,7 +165,9 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null const named: Named = { red: { self: themeColor.base.red, - light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.red, 15) : scaleColorLight(themeColor.base.red, 25), + light: themeColor.isDarkTheme + ? scaleColorLight(themeColor.base.red, 15) + : scaleColorLight(themeColor.base.red, 25), dark: { num1: scaleColorLight(themeColor.base.red, -10), num2: scaleColorLight(themeColor.base.red, -20), @@ -180,7 +182,9 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null }, orange: { self: themeColor.base.orange, - light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.orange, 15) : scaleColorLight(themeColor.base.orange, 25), + light: themeColor.isDarkTheme + ? scaleColorLight(themeColor.base.orange, 15) + : scaleColorLight(themeColor.base.orange, 25), dark: { num1: scaleColorLight(themeColor.base.orange, -10), num2: scaleColorLight(themeColor.base.orange, -20), @@ -195,7 +199,9 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null }, yellow: { self: themeColor.base.yellow, - light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.yellow, 15) : scaleColorLight(themeColor.base.yellow, 25), + light: themeColor.isDarkTheme + ? scaleColorLight(themeColor.base.yellow, 15) + : scaleColorLight(themeColor.base.yellow, 25), dark: { num1: scaleColorLight(themeColor.base.yellow, -10), num2: scaleColorLight(themeColor.base.yellow, -20), @@ -210,7 +216,9 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null }, olive: { self: themeColor.base.olive, - light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.olive, 15) : scaleColorLight(themeColor.base.olive, 25), + light: themeColor.isDarkTheme + ? scaleColorLight(themeColor.base.olive, 15) + : scaleColorLight(themeColor.base.olive, 25), dark: { num1: scaleColorLight(themeColor.base.olive, -10), num2: scaleColorLight(themeColor.base.olive, -20), @@ -218,7 +226,9 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null }, green: { self: themeColor.base.green, - light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.green, 15) : scaleColorLight(themeColor.base.green, 25), + light: themeColor.isDarkTheme + ? scaleColorLight(themeColor.base.green, 15) + : scaleColorLight(themeColor.base.green, 25), dark: { num1: scaleColorLight(themeColor.base.green, -10), num2: scaleColorLight(themeColor.base.green, -20), @@ -233,7 +243,9 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null }, teal: { self: themeColor.base.teal, - light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.teal, 15) : scaleColorLight(themeColor.base.teal, 25), + light: themeColor.isDarkTheme + ? scaleColorLight(themeColor.base.teal, 15) + : scaleColorLight(themeColor.base.teal, 25), dark: { num1: scaleColorLight(themeColor.base.teal, -10), num2: scaleColorLight(themeColor.base.teal, -20), @@ -241,7 +253,9 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null }, blue: { self: themeColor.base.blue, - light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.blue, 15) : scaleColorLight(themeColor.base.blue, 25), + light: themeColor.isDarkTheme + ? scaleColorLight(themeColor.base.blue, 15) + : scaleColorLight(themeColor.base.blue, 25), dark: { num1: scaleColorLight(themeColor.base.blue, -10), num2: scaleColorLight(themeColor.base.blue, -20), @@ -249,7 +263,9 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null }, violet: { self: themeColor.base.violet, - light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.violet, 15) : scaleColorLight(themeColor.base.violet, 25), + light: themeColor.isDarkTheme + ? scaleColorLight(themeColor.base.violet, 15) + : scaleColorLight(themeColor.base.violet, 25), dark: { num1: scaleColorLight(themeColor.base.violet, -10), num2: scaleColorLight(themeColor.base.violet, -20), @@ -257,7 +273,9 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null }, purple: { self: themeColor.base.purple, - light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.purple, 15) : scaleColorLight(themeColor.base.purple, 25), + light: themeColor.isDarkTheme + ? scaleColorLight(themeColor.base.purple, 15) + : scaleColorLight(themeColor.base.purple, 25), dark: { num1: scaleColorLight(themeColor.base.purple, -10), num2: scaleColorLight(themeColor.base.purple, -20), @@ -265,7 +283,9 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null }, pink: { self: themeColor.base.pink, - light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.pink, 15) : scaleColorLight(themeColor.base.pink, 25), + light: themeColor.isDarkTheme + ? scaleColorLight(themeColor.base.pink, 15) + : scaleColorLight(themeColor.base.pink, 25), dark: { num1: scaleColorLight(themeColor.base.pink, -10), num2: scaleColorLight(themeColor.base.pink, -20), @@ -273,7 +293,9 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null }, brown: { self: themeColor.base.brown, - light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.brown, 15) : scaleColorLight(themeColor.base.brown, 25), + light: themeColor.isDarkTheme + ? scaleColorLight(themeColor.base.brown, 15) + : scaleColorLight(themeColor.base.brown, 25), dark: { num1: scaleColorLight(themeColor.base.brown, -10), num2: scaleColorLight(themeColor.base.brown, -20), @@ -281,7 +303,9 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null }, black: { self: themeColor.base.black, - light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.black, 15) : scaleColorLight(themeColor.base.black, 25), + light: themeColor.isDarkTheme + ? scaleColorLight(themeColor.base.black, 15) + : scaleColorLight(themeColor.base.black, 25), dark: { num1: scaleColorLight(themeColor.base.black, -10), num2: scaleColorLight(themeColor.base.black, -20), @@ -289,7 +313,9 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null }, grey: { self: themeColor.base.grey, - light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.grey, 15) : scaleColorLight(themeColor.base.grey, 25), + light: themeColor.isDarkTheme + ? scaleColorLight(themeColor.base.grey, 15) + : scaleColorLight(themeColor.base.grey, 25), }, gold: themeColor.base.gold, white: themeColor.base.white, @@ -338,7 +364,9 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null yellow: themeVars.color.yellow.light, blue: themeVars.color.blue.light, magenta: themeVars.color.pink.light, - cyan: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.cyan, 10) : scaleColorLight(themeColor.base.cyan, 25), + cyan: themeColor.isDarkTheme + ? scaleColorLight(themeColor.base.cyan, 10) + : scaleColorLight(themeColor.base.cyan, 25), white: themeVars.color.console.fg.self, }, }; diff --git a/styles/components/index.ts b/styles/components/index.ts index 3d048eb..c1483ae 100644 --- a/styles/components/index.ts +++ b/styles/components/index.ts @@ -1,8 +1,10 @@ import "./actions"; +import "./chroma"; import "./clone"; import "./commit"; import "./dashboard"; import "./diff"; +import "./editor"; import "./explore"; import "./filelist"; import "./heatmap"; @@ -14,5 +16,3 @@ import "./repo"; import "./setting"; import "./signin"; import "./user"; -import "./chroma"; -import "./editor" \ No newline at end of file diff --git a/styles/public/attached.ts b/styles/public/attached.ts index d662279..df3d000 100644 --- a/styles/public/attached.ts +++ b/styles/public/attached.ts @@ -1,4 +1,4 @@ -import { css, themeVars, otherThemeVars } from "src/types/vars"; +import { css, otherThemeVars, themeVars } from "src/types/vars"; export const attached = css` // 设置右面板的内容