Compare commits

...

18 Commits

Author SHA1 Message Date
鲁汀
8dcd7cf002 探索/组织/用户仓库样式 github 布局 (#8)
Co-authored-by: lutinglt <lutinglt@users.noreply.github.com>
2025-08-06 15:05:43 +08:00
lutinglt
93e5fa8a7d update todo 2025-08-06 11:10:19 +08:00
lutinglt
8c5020fa09 同步探索页面仓库样式 2025-08-06 11:05:57 +08:00
lutinglt
35520fb3fc 难受 2025-08-05 18:18:54 +08:00
lutinglt
728673ffcd Gitea 大便的 UI 逻辑问题 2025-08-05 18:14:04 +08:00
lutinglt
f7c1cf430f 评论和表情样式同步 2025-08-05 18:08:24 +08:00
lutinglt
c6306a23d4 update readme 2025-08-05 16:04:54 +08:00
lutinglt
f813122573 update readme 2025-08-05 16:00:46 +08:00
lutinglt
603d22d877 支持克隆菜单自定义长度 2025-08-05 15:55:25 +08:00
lutinglt
4f4b99a600 分支菜单项目添加动画效果 2025-08-05 15:25:41 +08:00
lutinglt
a1cc1509ce 移除 react 2025-08-05 12:59:23 +08:00
鲁汀
305b2eca0b 动画迁移 & 部分 PR 样式 (#7)
* 弹窗动画

* 优化 PR 中的合并提交按钮颜色

* 优化按钮样式

* 同步 PR 的合并提交头像样式

* 同步 Issue/PR 的时间线样式

* Issue/PR 的时间线样式间隔和大小

* 同步 PR 的合并提交操作面板样式

* PR 操作间隔

* green

* PR 操作边框色

* 已合并颜色

* 仓库同步派生栏样式同步

* 动画迁移 & 一些圆角修复

* 修复工单下依赖工单选择框

* 评论标题颜色&分支字体&提交栏样式

---------

Co-authored-by: lutinglt <lutinglt@users.noreply.github.com>
2025-08-05 12:39:35 +08:00
lutinglt
f635b30c9c 优化向上弹窗的菜单动画 2025-07-08 22:57:12 +08:00
lutinglt
1434c54ba3 svg 2025-07-08 19:27:50 +08:00
lutinglt
b9b12e7ed2 优化按钮和菜单下的图标颜色 2025-07-08 19:08:54 +08:00
lutinglt
f9755704ec 漏掉的类型筛选 2025-07-08 18:35:35 +08:00
lutinglt
120d24cb10 状态标签位置调整 2025-07-08 18:30:03 +08:00
lutinglt
77e2227029 删除了提交中 Action 状态标签多余的间隔 2025-07-08 18:10:25 +08:00
47 changed files with 805 additions and 289 deletions

View File

@@ -1,3 +1,7 @@
## ✨ Feature
#### CSS 变量
## 🌈 Style ## 🌈 Style
#### 更符合 GitHub 风格 #### 更符合 GitHub 风格

25
.github/release.md vendored
View File

@@ -1,19 +1,20 @@
## ✨ Feature
#### CSS 变量
- 支持自定义探索/组织/用户页面的仓库列表列数
- 支持自定义探索/组织页面的用户/组织列表列数
## 🌈 Style ## 🌈 Style
#### 更符合 GitHub 风格 #### 更符合 GitHub 风格
- 创建仓库页面下拉菜单选项样式同步 - 同步 Issue/PR 的评论样式
- 使克隆菜单非常像 GitHub, 调整了元素的高度和宽度以及克隆地址的字体 - 同步表情菜单样式
- 同步探索/组织/用户页面的仓库列表样式
## 🎈 Perf - 同步探索/组织页面的用户列表样式
- 同步探索页面的组织列表样式
- 稍微减小了热力图方块的大小
## 🐞 Fix ## 🐞 Fix
- 修复顶部导航栏的菜单按钮悬浮颜色 - 修复探索页面下仓库的类型标签意外触发悬浮效果
- 修复选择输入框的样式
- 修复创建仓库时拥有者按钮的高度
- 修复一些输入框在整体元素中不居中
- 修复一些下拉菜单在向上弹出时与向下弹出不一致的问题
- 修复一些下拉菜单缺失边框线, 比如仓库动态的右侧菜单按钮

View File

@@ -26,6 +26,40 @@ THEMES = gitea-dark, github-dark
详细请查看 Gitea 文档 详细请查看 Gitea 文档
[Gitea docs](https://docs.gitea.com/next/administration/customizing-gitea#customizing-the-look-of-gitea) [Gitea docs](https://docs.gitea.com/next/administration/customizing-gitea#customizing-the-look-of-gitea)
## 自定义 CSS 变量
可以根据自己的偏好自定义主题的一部分样式
### 使用方法
在主题的 CSS 文件的头部或尾部添加以下代码
```css
:root {
--custom-clone-menu-width: 150px;
...
}
```
> [!IMPORTANT]
>
> 请确保在 `:root` 选择器中添加自定义变量,否则无法生效
>
> 变量之间用 `;` 分隔
>
> 建议自定义变量放在单独的文件中, 通过 shell 命令等方式追加到主题文件中
### CSS 变量
| 变量名 | 描述 | 默认值 | Github | 推荐 | 最小值 | 最大值 |
| :-------------------------------- | :-------------------------- | :----- | :----- | :---- | :----- | :----- |
| --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 | 2 | | |
| --custom-org-repolist-columns | 组织页面的仓库列表列数 | 1 | 1 | 1 | | |
| --custom-org-userlist-columns | 组织页面的用户列表列数 | 2 | 1 | 2 | | |
## 截图 ## 截图
![仓库](screenshots/repo.png) ![仓库](screenshots/repo.png)

View File

@@ -1,17 +1,12 @@
### 轻量
- hover 动画迁移
- 列表部分 item 展开动画迁移
### 重大 ### 重大
- gitea issue 默认标签颜色匹配使用 github 样式 - gitea issue 默认标签颜色匹配使用 github 样式
- 探索/组织/用户仓库样式 github 布局
- issue/PR 列表样式 github 布局 - issue/PR 列表样式 github 布局
- styles/themes 库组件导出整理 - styles/themes 库组件导出整理
- defineTheme 颜色生成代码重构 - defineTheme 颜色生成代码重构
- 亮色主题适配/测试 - 亮色主题适配/测试
- 自动颜色主题生成 - 自动颜色主题生成
- github primer 官方库集成
### 其他 ### 其他

11
eslint.config.js vendored
View File

@@ -1,6 +1,4 @@
import js from "@eslint/js"; import js from "@eslint/js";
import reactHooks from "eslint-plugin-react-hooks";
import reactRefresh from "eslint-plugin-react-refresh";
import globals from "globals"; import globals from "globals";
import tseslint from "typescript-eslint"; import tseslint from "typescript-eslint";
@@ -8,17 +6,10 @@ export default tseslint.config(
{ ignores: ["dist"] }, { ignores: ["dist"] },
{ {
extends: [js.configs.recommended, ...tseslint.configs.recommended], extends: [js.configs.recommended, ...tseslint.configs.recommended],
files: ["**/*.{ts,tsx}"], files: ["**/*.{ts}"],
languageOptions: { languageOptions: {
ecmaVersion: 2020, ecmaVersion: 2020,
globals: globals.browser, globals: globals.browser,
}, },
plugins: {
"react-hooks": reactHooks,
"react-refresh": reactRefresh,
},
rules: {
...reactHooks.configs.recommended.rules,
},
} }
); );

View File

@@ -1,6 +1,6 @@
{ {
"name": "gitea-github-theme", "name": "gitea-github-theme",
"version": "1.24.2", "version": "1.24.4",
"description": "A theme to make Gitea look and feel like GitHub", "description": "A theme to make Gitea look and feel like GitHub",
"type": "module", "type": "module",
"scripts": { "scripts": {
@@ -12,35 +12,26 @@
"version": "node scripts/version.cjs" "version": "node scripts/version.cjs"
}, },
"devDependencies": { "devDependencies": {
"@babel/preset-react": "^7.27.1",
"@babel/preset-typescript": "^7.27.1", "@babel/preset-typescript": "^7.27.1",
"@eslint/js": "^9.29.0", "@eslint/js": "^9.29.0",
"@linaria/core": "^6.3.0", "@linaria/core": "^6.3.0",
"@linaria/react": "^6.3.0",
"@types/node": "^24.0.3", "@types/node": "^24.0.3",
"@types/react": "^19.1.8",
"@types/react-dom": "^19.1.6",
"@vanilla-extract/css": "^1.17.4", "@vanilla-extract/css": "^1.17.4",
"@vanilla-extract/vite-plugin": "^5.0.6", "@vanilla-extract/vite-plugin": "^5.0.6",
"@vitejs/plugin-react": "^4.5.2",
"@vitejs/plugin-react-swc": "^3.10.2",
"@wyw-in-js/babel-preset": "^0.7.0", "@wyw-in-js/babel-preset": "^0.7.0",
"@wyw-in-js/vite": "^0.7.0", "@wyw-in-js/vite": "^0.7.0",
"dotenv": "^17.0.0", "dotenv": "^17.0.0",
"eslint": "^9.29.0", "eslint": "^9.29.0",
"eslint-plugin-react-hooks": "^5.2.0",
"eslint-plugin-react-refresh": "^0.4.20",
"globals": "^16.2.0", "globals": "^16.2.0",
"lightningcss": "^1.30.1", "lightningcss": "^1.30.1",
"polished": "^4.3.1", "polished": "^4.3.1",
"prettier": "3.5.3", "prettier": "3.5.3",
"prettier-plugin-organize-imports": "^4.1.0", "prettier-plugin-organize-imports": "^4.1.0",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"sass-embedded": "^1.89.2", "sass-embedded": "^1.89.2",
"typescript": "^5.8.3", "typescript": "^5.8.3",
"typescript-eslint": "^8.34.1", "typescript-eslint": "^8.34.1",
"typescript-plugin-css-modules": "^5.1.0", "typescript-plugin-css-modules": "^5.1.0",
"typescript-styled-plugin": "^0.18.3",
"vite": "^6.3.5" "vite": "^6.3.5"
}, },
"prettier": { "prettier": {
@@ -62,8 +53,5 @@
"prettier-plugin-organize-imports" "prettier-plugin-organize-imports"
], ],
"organizeImportsSkipDestructiveCodeActions": false "organizeImportsSkipDestructiveCodeActions": false
},
"dependencies": {
"typescript-styled-plugin": "^0.18.3"
} }
} }

View File

@@ -350,6 +350,9 @@ export function defineGithubTheme(githubColor: GithubColor): Theme {
}, },
}, },
control: { control: {
bgColor: {
rest: githubColor.control.bgColor.rest,
},
transparent: { transparent: {
bgColor: { bgColor: {
hover: githubColor.control.transparent.bgColor.hover, hover: githubColor.control.transparent.bgColor.hover,

View File

@@ -13,8 +13,10 @@ function stringToBoolean(str: string, name: string): boolean {
} }
} }
export const overlayAppear = "overlay-appear"; export const overlayAppearDown = "overlay-appear-down";
export const animation = `200ms cubic-bezier(0.33, 1, 0.68, 1) 0s 1 normal none running ${overlayAppear}`; export const animationDown = `200ms cubic-bezier(0.33, 1, 0.68, 1) 0s 1 normal none running ${overlayAppearDown}`;
export const overlayAppearUp = "overlay-appear-up";
export const animationUp = `200ms cubic-bezier(0.33, 1, 0.68, 1) 0s 1 normal none running ${overlayAppearUp}`;
const emoji = ` const emoji = `
.emoji[aria-label="check mark"], .emoji[aria-label="check mark"],
@@ -46,22 +48,28 @@ export function createTheme(theme: Theme): void {
} }
createGlobalTheme(":root", themeVars, theme); createGlobalTheme(":root", themeVars, theme);
createGlobalTheme(":root", otherThemeVars, { createGlobalTheme(":root", otherThemeVars, {
git: "#f05133",
light: {
mimicEnabled: isDarkTheme
? "rgba(0, 0, 0, calc(40 / 255 * 222 / 255 / var(--opacity-disabled)))"
: "rgba(0, 0, 0, calc(6 / 255 * 222 / 255 / var(--opacity-disabled)))",
},
border: { border: {
radius: "6px", radius: "6px",
}, },
color: {
git: "#f05133",
light: {
mimicEnabled: isDarkTheme
? "rgba(0, 0, 0, calc(40 / 255 * 222 / 255 / var(--opacity-disabled)))"
: "rgba(0, 0, 0, calc(6 / 255 * 222 / 255 / var(--opacity-disabled)))",
},
},
}); });
globalStyle(":root", { globalStyle(":root", {
accentColor: themeVars.color.accent, accentColor: themeVars.color.accent,
colorScheme: isDarkTheme ? "dark" : "light", colorScheme: isDarkTheme ? "dark" : "light",
}); });
globalKeyframes(overlayAppear, { globalKeyframes(overlayAppearDown, {
"0%": { opacity: 0, transform: "translateY(-12px)" }, "0%": { opacity: 0, transform: "translateY(-8px)" },
"100%": { opacity: 1, transform: "translateY(0)" },
});
globalKeyframes(overlayAppearUp, {
"0%": { opacity: 0, transform: "translateY(8px)" },
"100%": { opacity: 1, transform: "translateY(0)" }, "100%": { opacity: 1, transform: "translateY(0)" },
}); });
} }

View File

@@ -1,8 +1,8 @@
type Primitive = string | boolean | number | null | undefined; type Primitive = string | boolean | number | null | undefined;
type Tokens = { [key: string]: string | Tokens }; type Tokens = { [key: string]: string | Tokens };
export type CSSVarFunction = `var(--${string})`;
export type WithOptionalLayer<T extends Tokens> = T & { "@layer"?: string }; export type WithOptionalLayer<T extends Tokens> = T & { "@layer"?: string };
export type MapLeafNodes<Obj, LeafType> = { export type MapLeafNodes<Obj, LeafType> = {
[Prop in keyof Obj]: Obj[Prop] extends Primitive [Prop in keyof Obj]: Obj[Prop] extends Primitive
? LeafType ? LeafType

View File

@@ -4,7 +4,7 @@ import fs from "node:fs";
import path from "node:path"; import path from "node:path";
import type { Plugin } from "vite"; import type { Plugin } from "vite";
const suffix = ".css.tsx"; const suffix = ".css.ts";
/** /**
* 生成主题输入 * 生成主题输入

View File

@@ -1 +1,2 @@
export { scaleColorLight } from "./scss"; export { scaleColorLight } from "./scss";
export { fallbackVar } from "./var";

7
src/functions/var.ts Normal file
View File

@@ -0,0 +1,7 @@
import type { CSSVarFunction } from "src/core/types";
type CSSFallbackVar = `var(--${string}, ${string})`;
export function fallbackVar(cssvar: CSSVarFunction, fallback: string): CSSFallbackVar {
const var_name = cssvar.replace("var(--", "").replace(")", "");
return `var(--${var_name}, ${fallback})`;
}

View File

@@ -28,6 +28,7 @@ export const github = {
* @actions `actionViewLeft` 左侧子作业激活伪元素颜色 * @actions `actionViewLeft` 左侧子作业激活伪元素颜色
* @release `releaseTagMenu` 顶部栏左侧按钮激活背景色 * @release `releaseTagMenu` 顶部栏左侧按钮激活背景色
* @navbar `navbarRight` 头像管理员标识背景颜色 * @navbar `navbarRight` 头像管理员标识背景颜色
* @dropdown `dropdown` emoji 的悬停背景色
*/ */
emphasis: null, emphasis: null,
/** 暗淡的背景颜色 /** 暗淡的背景颜色
@@ -41,6 +42,7 @@ export const github = {
success: { success: {
/** 成功的背景颜色 /** 成功的背景颜色
* @issue `babel` 重新开启图标背景颜色 * @issue `babel` 重新开启图标背景颜色
* @issue `prMerge` 合并提交的图标背景色
*/ */
emphasis: null, emphasis: null,
}, },
@@ -157,6 +159,12 @@ export const github = {
}, },
}, },
control: { control: {
bgColor: {
/** 背景色
* @issue `timeline` 时间线标签背景色
*/
rest: null,
},
transparent: { transparent: {
bgColor: { bgColor: {
/** 悬停色 /** 悬停色

View File

@@ -30,10 +30,28 @@ const otherVars = {
border: { border: {
radius: null, radius: null,
}, },
...color.otherAuto, color: {
...color.otherAuto,
},
};
const customVars = {
custom: {
cloneMenuWidth: "custom-clone-menu-width",
explore: {
repolistColumns: "custom-explore-repolist-columns",
userlistColumns: "custom-explore-userlist-columns",
},
userRepolistColumns: "custom-user-repolist-columns",
org: {
repolistColumns: "custom-org-repolist-columns",
userlistColumns: "custom-org-userlist-columns",
},
},
}; };
export const themeVars = createGlobalThemeContract(vars, varMapper); export const themeVars = createGlobalThemeContract(vars, varMapper);
export const otherThemeVars = createGlobalThemeContract(otherVars, varMapper); export const otherThemeVars = createGlobalThemeContract(otherVars, varMapper);
export const customThemeVars = createGlobalThemeContract(customVars, varMapper);
export { css } from "@linaria/core"; export { css } from "@linaria/core";

View File

@@ -1,3 +1,4 @@
import { animationDown } from "src/core/theme";
import { css, otherThemeVars, themeVars } from "src/types/vars"; import { css, otherThemeVars, themeVars } from "src/types/vars";
// 仓库 Actions 页面 // 仓库 Actions 页面
@@ -57,6 +58,7 @@ export const actions = css`
.run-list-ref { .run-list-ref {
background-color: ${themeVars.github.bgColor.accent.muted}; background-color: ${themeVars.github.bgColor.accent.muted};
color: ${themeVars.github.fgColor.accent}; color: ${themeVars.github.fgColor.accent};
font-family: var(--fontStack-monospace, ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, monospace);
font-weight: 400; font-weight: 400;
&:hover { &:hover {
background-color: ${themeVars.github.bgColor.accent.muted}; background-color: ${themeVars.github.bgColor.accent.muted};
@@ -132,6 +134,7 @@ export const actionViewHeader = css`
.ui.label { .ui.label {
background-color: ${themeVars.github.bgColor.accent.muted}; background-color: ${themeVars.github.bgColor.accent.muted};
color: ${themeVars.github.fgColor.accent}; color: ${themeVars.github.fgColor.accent};
font-family: var(--fontStack-monospace, ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, monospace);
font-weight: 400; font-weight: 400;
> a { > a {
opacity: 1; opacity: 1;
@@ -212,6 +215,7 @@ export const actionViewRight = css`
} }
.job-step-container { .job-step-container {
// 步骤标题
.job-step-summary { .job-step-summary {
color: ${themeVars.color.console.fg.subtle}; color: ${themeVars.color.console.fg.subtle};
padding: 8px 10px; padding: 8px 10px;
@@ -238,12 +242,16 @@ export const actionViewRight = css`
} }
} }
} }
/* 日志字体颜色白色 */ // 步骤日志
.job-log-line { .job-step-logs {
color: ${themeVars.color.console.fg.self}; animation: ${animationDown};
/* 被 hover 时覆盖 ANSI 颜色 */ /* 日志字体颜色白色 */
.log-msg:hover * { .job-log-line {
color: ${themeVars.color.console.fg.self} !important; color: ${themeVars.color.console.fg.self};
/* 被 hover 时覆盖 ANSI 颜色 */
.log-msg:hover * {
color: ${themeVars.color.console.fg.self} !important;
}
} }
} }
} }

View File

@@ -1,4 +1,4 @@
import { css, otherThemeVars, themeVars } from "src/types/vars"; import { css, customThemeVars, otherThemeVars, themeVars } from "src/types/vars";
// 克隆按钮的弹窗 // 克隆按钮的弹窗
export const clone = css` export const clone = css`
@@ -52,7 +52,9 @@ export const clone = css`
border: 1px solid ${themeVars.color.light.border}; border: 1px solid ${themeVars.color.light.border};
border-radius: ${otherThemeVars.border.radius}; border-radius: ${otherThemeVars.border.radius};
font-family: var(--fontStack-monospace, ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, monospace); font-family: var(--fontStack-monospace, ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, monospace);
width: 332px; min-width: 150px;
max-width: 400px;
width: ${customThemeVars.custom.cloneMenuWidth};
&:hover { &:hover {
border: 1px solid ${themeVars.color.light.border}; border: 1px solid ${themeVars.color.light.border};
border-radius: ${otherThemeVars.border.radius}; border-radius: ${otherThemeVars.border.radius};

View File

@@ -57,8 +57,8 @@ export const commit = css`
export const commitStatus = css` export const commitStatus = css`
.flex-text-inline[data-global-init="initCommitStatuses"] { .flex-text-inline[data-global-init="initCommitStatuses"] {
padding: 6px; padding: 6px;
margin-top: 2px;
border-radius: ${otherThemeVars.border.radius}; border-radius: ${otherThemeVars.border.radius};
margin-right: 6px;
&:hover { &:hover {
background-color: ${themeVars.github.control.transparent.bgColor.hover}; background-color: ${themeVars.github.control.transparent.bgColor.hover};
} }

View File

@@ -0,0 +1,161 @@
import { fallbackVar } from "src/functions";
import { css, customThemeVars, otherThemeVars, themeVars } from "src/types/vars";
const userRepoVar = fallbackVar(customThemeVars.custom.userRepolistColumns, "2");
const exploreRepoVar = fallbackVar(customThemeVars.custom.explore.repolistColumns, "2");
const orgRepoVar = fallbackVar(customThemeVars.custom.org.repolistColumns, "1");
// 仓库列表
export const repoList = css`
// 组织
.page-content.organization.profile > .ui.container > .ui.stackable > .ui.eleven,
// 用户
.page-content.user.profile > .ui.container > .ui.stackable > .ui.twelve,
// 探索
.page-content.explore.repositories > .ui.container {
> .flex-list {
display: grid;
> .flex-item {
border: 1px solid ${themeVars.color.light.border};
border-radius: ${otherThemeVars.border.radius};
padding: 16px;
// 仓库头像
> .flex-item-leading {
img,
svg {
color: ${themeVars.color.text.light.num1};
}
}
// 仓库信息
> .flex-item-main {
// 仓库标题
> .flex-item-header {
// 仓库名称
> .flex-item-title {
gap: 8px;
// 仓库中间的间隔线
&:not(a) {
color: ${themeVars.color.text.light.num1};
}
// 仓库类型和状态标签
> .label-list .label {
padding: 3px 6px;
}
}
// 仓库语言, 星标
> .flex-item-trailing {
color: ${themeVars.color.text.light.num1};
gap: 16px;
font-size: 12px;
> .flex-text-inline .color-icon {
width: 12px;
height: 12px;
margin-right: 0 !important;
}
}
}
// 描述和更新时间
> .flex-item-body {
margin-top: 8px;
// 更新时间
&:last-child {
font-size: 12px;
}
}
// 主题标签
> .label-list {
margin-top: 8px;
}
}
}
}
}
// 仓库列表列数
// 组织
.page-content.organization.profile > .ui.container > .ui.stackable > .ui.eleven > .flex-list {
grid-template-columns: repeat(${orgRepoVar}, 1fr);
gap: min(${orgRepoVar} * 8px, 16px);
}
// 用户
.page-content.user.profile > .ui.container > .ui.stackable > .ui.twelve > .flex-list {
grid-template-columns: repeat(${userRepoVar}, 1fr);
gap: min(${userRepoVar} * 8px, 16px);
}
// 探索
.page-content.explore.repositories > .ui.container > .flex-list {
grid-template-columns: repeat(${exploreRepoVar}, 1fr);
gap: min(${exploreRepoVar} * 8px, 16px);
}
`;
const exploreUserVar = fallbackVar(customThemeVars.custom.explore.userlistColumns, "3");
const orgUserVar = fallbackVar(customThemeVars.custom.org.userlistColumns, "2");
// 用户列表
export const userList = css`
// 组织
.page-content.organization.members > .ui.container,
// 探索的用户和组织
.page-content.explore.users > .ui.container {
> .flex-list {
display: grid;
> .flex-item {
border: 1px solid ${themeVars.color.light.border};
border-radius: ${otherThemeVars.border.radius};
padding: 16px;
> .flex-item-main {
// 用户名称
> .flex-item-title {
gap: 8px;
margin-bottom: 8px;
// 用户标签
> .label {
font-size: 12px;
padding: 3px 6px;
}
}
// 用户描述
> .flex-item-body {
font-size: 12px;
svg {
width: 12px;
min-width: 12px;
}
}
}
}
}
}
// 用户列表列数
// 组织
.page-content.organization.members > .ui.container > .flex-list {
grid-template-columns: repeat(${orgUserVar}, 1fr);
gap: min(${orgUserVar} * 8px, 16px);
}
// 探索的用户和组织
.page-content.explore.users > .ui.container > .flex-list {
grid-template-columns: repeat(${exploreUserVar}, 1fr);
gap: min(${exploreUserVar} * 8px, 16px);
}
`;
// 手机下的仓库和用户列表
export const mobileList = css`
@media (max-width: 767.98px) {
// 组织的仓库列表
.page-content.organization.profile > .ui.container > .ui.stackable > .ui.eleven,
// 用户的仓库列表
.page-content.user.profile > .ui.container > .ui.stackable > .ui.twelve,
// 探索的仓库列表
.page-content.explore.repositories > .ui.container,
// 组织的成员列表
.page-content.organization.members >.ui.container,
// 探索的用户和组织列表
.page-content.explore.users >.ui.container {
> .flex-list {
grid-template-columns: 1fr;
gap: 8px;
}
}
}
`;

View File

@@ -16,12 +16,15 @@ export const branchButton = css`
} }
`; `;
// 仓库按钮 // 仓库同步派生
export const repoButton = css` export const syncFork = css`
.page-content.repository.file.list { .page-content.repository.file.list {
// clone 按钮调整 .repo-home-filelist > .ui.message {
.repo-button-row .repo-button-row-right .ui.primary.button span { background: ${themeVars.color.box.header};
margin: 0px 3px; padding: 8px 8px 8px 16px;
.ui.button {
min-width: 96px;
}
} }
} }
`; `;
@@ -45,17 +48,16 @@ export const repoFiles = css`
&.repo-file-last-commit { &.repo-file-last-commit {
min-height: 3.725rem; min-height: 3.725rem;
.latest-commit { .latest-commit {
gap: 8px;
.commit-summary { .commit-summary {
color: ${themeVars.color.text.light.num1}; color: ${themeVars.color.text.light.num1};
} }
img.tw-align-middle { img.tw-align-middle {
margin-top: -1px; margin-top: -1px;
margin-left: 1px; margin-left: 1px;
margin-right: 8px !important;
} }
// 作者 // 作者
.author-wrapper { .author-wrapper {
margin-right: 6px;
&:hover { &:hover {
color: ${themeVars.color.text.self}; color: ${themeVars.color.text.self};
} }
@@ -108,6 +110,29 @@ export const repoFilesMobile = css`
} }
`; `;
// 仓库打开文件时的视图
export const repoFileView = css`
.page-content.repository.file.list {
.repo-view-container {
// 右侧文件视图内容
.repo-view-content {
// 头部提交信息
#repo-file-commit-box {
padding: 8px 12px;
> .latest-commit {
gap: 8px;
}
// 右侧提交时间
> .age {
display: flex;
align-items: center;
}
}
}
}
}
`;
// 仓库代码布局调整, 侧边栏宽度调整 // 仓库代码布局调整, 侧边栏宽度调整
export const repoGrid = css` export const repoGrid = css`
.repo-grid-filelist-sidebar { .repo-grid-filelist-sidebar {
@@ -199,7 +224,7 @@ export const repoSidebarBottom = css`
.color-icon { .color-icon {
height: 8px; height: 8px;
width: 8px; width: 8px;
margin-right: 6px; margin-right: 8px;
} }
.tw-font-semibold { .tw-font-semibold {
color: ${themeVars.color.text.self}; color: ${themeVars.color.text.self};

View File

@@ -3,6 +3,7 @@ import "./clone";
import "./commit"; import "./commit";
import "./dashboard"; import "./dashboard";
import "./diff"; import "./diff";
import "./explore";
import "./filelist"; import "./filelist";
import "./heatmap"; import "./heatmap";
import "./issue"; import "./issue";

332
styles/components/issue.ts Normal file
View File

@@ -0,0 +1,332 @@
import { css, otherThemeVars, themeVars } from "src/types/vars";
import { activeItemAfterStyle } from "styles/public/menu";
export const button = css`
.issue-content-left .field.footer {
// 关闭工单按钮
.ui.red.basic.button#status-button {
color: ${themeVars.github.fgColor.done};
background-color: ${themeVars.color.button};
border-color: ${themeVars.color.light.border};
&:hover {
background-color: ${themeVars.color.hover.self};
}
}
// 重新开启按钮
.ui.basic.primary.button#status-button {
color: ${themeVars.github.fgColor.success};
}
}
`;
export const babel = css`
.issue-content-left {
.badge {
// 时间线打开状态标签
&.tw-bg-green {
background-color: ${themeVars.github.bgColor.success.emphasis} !important;
}
// 时间线关闭状态标签
&.tw-bg-red {
background-color: ${themeVars.github.bgColor.done.emphasis} !important;
}
// 时间线合并状态标签
&.tw-bg-purple {
background-color: ${themeVars.github.bgColor.done.emphasis} !important;
}
}
}
// 工单&PR状态标签
.ui.label.issue-state-label {
border-radius: 25px !important;
&.green {
color: ${themeVars.color.text.self} !important;
background-color: ${themeVars.github.bgColor.success.emphasis} !important;
border-color: ${themeVars.github.bgColor.success.emphasis} !important;
}
&.red {
color: ${themeVars.color.text.self} !important;
background-color: ${themeVars.github.bgColor.done.emphasis} !important;
border-color: ${themeVars.github.bgColor.done.emphasis} !important;
}
&.purple {
color: ${themeVars.color.text.self} !important;
background-color: ${themeVars.github.bgColor.done.emphasis} !important;
border-color: ${themeVars.github.bgColor.done.emphasis} !important;
}
}
`;
// PR 分支标签
export const prBranch = css`
.repository.view.issue .pull-desc code,
#issue-list .flex-item-body .branches .branch {
color: ${themeVars.github.fgColor.accent};
background-color: ${themeVars.github.bgColor.accent.muted};
border-radius: ${otherThemeVars.border.radius};
font-family: var(--fontStack-monospace, ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, monospace);
font-size: 12px;
padding: 0 5px;
line-height: 20px;
}
.repository.view.issue .pull-desc code {
padding-top: 3px;
padding-bottom: 3px;
a:hover {
text-decoration-line: none;
}
}
`;
// 评论
export const comment = css`
.comment .comment-container {
// 去除评论标题左侧指向头像的小箭头
.comment-header,
&:target .comment-header {
&:before,
&:after {
display: none;
}
}
// 评论焦点样式
&:target {
.comment-container {
border-color: ${themeVars.github.borderColor.accent.emphasis} !important;
box-shadow: 0 0 0 1px ${themeVars.color.primary.self} !important;
}
}
.comment-header {
padding: 4px 4px 4px 16px;
}
.comment-header-right {
> .item,
> .label {
color: ${themeVars.color.text.light.num1};
}
> .ui.label {
background-color: initial;
font-size: 12px;
height: 20px;
padding: 0 6px;
}
// 隐藏顶部菜单的表情按钮
// 无法使用此样式, 评论无表情时底部的表情按钮元素不会渲染, 这是一个先有鸡还是先有蛋的问题
// 很蛋疼, 希望 Gitea 早日使用 Github 的样式, 因为 Github 的更合理, 无论是操作的方便程度还是按钮的冗余度
// .ui.dropdown.action.select-reaction {
// display: none;
// }
.context-dropdown {
a.context-menu {
display: flex;
align-items: center;
}
// 评论菜单的删除按钮
.menu .item.delete-comment {
color: ${themeVars.color.red.self};
&:hover {
background-color: ${themeVars.color.red.badge.bg} !important;
color: ${themeVars.color.red.light};
}
}
}
}
// 表情菜单按钮头部+底部
.ui.dropdown.action.select-reaction > a {
display: flex;
align-items: center;
justify-content: center;
background: ${themeVars.color.button};
border-radius: 25px;
border: 1px solid ${themeVars.color.light.border};
color: ${themeVars.color.text.light.num1};
padding: 0px 8px !important;
height: 28px;
width: 28px;
}
// 底部表情栏
.bottom-reactions {
.ui.ui.ui.label {
background-color: unset !important;
border-radius: 25px;
border-color: ${themeVars.color.light.border};
&:hover {
background-color: ${themeVars.color.reaction.hoverBg} !important;
border-color: ${themeVars.color.light.border};
}
.reaction {
font-size: 12px;
}
.reaction-count {
color: ${themeVars.color.text.light.self};
font-weight: 500;
margin-left: 0;
}
}
// 显示表情菜单按钮
.select-reaction {
padding: 0;
// 两个表情按钮看着怪怪的, 很难受
// visibility: visible;
}
}
}
`;
export const dropdown = css`
.repository {
// Issue/PR 列表下的所有筛选菜单
&.issue-list .ui.dropdown .menu, .ui.menu .ui.dropdown .menu,
// Issue/PR 详情下的右侧的上半部分选项菜单
&.issue.view .issue-content-right .ui.dropdown .scrolling.menu {
.item:hover:after {
content: "";
${activeItemAfterStyle}
}
}
}
`;
// PR 界面的 PR 操作评论
export const prMerge = css`
.repository.view.issue .comment-list .timeline-item.pull-merge-box {
// 头像
.timeline-avatar {
color: ${themeVars.color.text.self} !important;
border-radius: ${otherThemeVars.border.radius};
width: 40px;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
svg {
width: 24px;
height: 24px;
}
// 可以合并
&.green {
background-color: ${themeVars.github.bgColor.success.emphasis};
// 操作评论边框色
+ .content > .ui.attached.segment {
border-left-color: ${themeVars.github.bgColor.success.emphasis};
border-right-color: ${themeVars.github.bgColor.success.emphasis};
&:first-child {
border-top-color: ${themeVars.github.bgColor.success.emphasis};
}
&:last-child {
border-bottom-color: ${themeVars.github.bgColor.success.emphasis};
}
}
}
// 已合并
&.purple {
background-color: ${themeVars.github.bgColor.done.emphasis};
+ .content > .ui.attached.segment {
border-left-color: ${themeVars.github.bgColor.done.emphasis};
border-right-color: ${themeVars.github.bgColor.done.emphasis};
&:first-child {
border-top-color: ${themeVars.github.bgColor.done.emphasis};
}
&:last-child {
border-bottom-color: ${themeVars.github.bgColor.done.emphasis};
}
}
}
}
// 检查状态
.commit-status-panel {
.commit-status-header {
background: ${themeVars.color.body};
padding: 16px;
font-size: 16px;
font-weight: 600;
.ui.right {
color: ${themeVars.color.text.light.num1};
font-size: 14px;
font-weight: 400;
}
}
// 检查状态列表
.commit-status-list {
background: ${themeVars.color.menu};
.commit-status-item {
border-radius: ${otherThemeVars.border.radius};
padding: 2px 8px;
margin: 0px 8px;
height: 37px;
&:first-child {
margin-top: 8px;
}
&:last-child {
margin-bottom: 8px;
}
&:hover {
background-color: ${themeVars.color.hover.opaque};
}
}
}
}
// 合并信息和操作
.merge-section {
color: ${themeVars.color.text.light.num1};
padding: 16px;
display: grid;
gap: 8px;
}
}
`;
// 时间线
export const timeline = css`
.repository.view.issue {
.comment-list {
.timeline-item,
.timeline-item-group {
padding: 16px 0;
// 事件
&.event {
// 修复覆盖后的位置问题
padding-left: 15px;
.avatar {
width: 20px;
height: 20px;
}
.badge {
border: 2px solid ${themeVars.color.body};
}
// 仅匹配只有 badge
.badge:not([class*=" "]) {
background-color: ${themeVars.github.control.bgColor.rest};
svg {
color: ${themeVars.color.text.light.num1};
}
}
}
// 提交
&.commits-list {
// 每个提交之间的间隔
.flex-text-block {
padding-top: 4px;
}
.badge svg {
color: ${themeVars.color.text.light.num1};
}
// 仅覆盖左侧 commit 不覆盖右侧 SHA
a.muted {
font-size: 12px;
color: ${themeVars.color.text.light.num1};
text-decoration-line: underline;
&:hover {
color: ${themeVars.color.primary.self};
}
}
}
}
}
}
`;

View File

@@ -1,123 +0,0 @@
import { css, themeVars } from "src/types/vars";
import { activeItemAfterStyle } from "styles/public/menu";
export const button = css`
.issue-content-left .field.footer {
// 关闭工单按钮
.ui.red.basic.button#status-button {
color: ${themeVars.github.fgColor.done};
background-color: ${themeVars.color.button};
border-color: ${themeVars.color.light.border};
&:hover {
background-color: ${themeVars.color.hover.self};
}
}
// 重新开启按钮
.ui.basic.primary.button#status-button {
color: ${themeVars.github.fgColor.success};
}
}
`;
export const babel = css`
.issue-content-left {
.badge {
// 时间线打开状态标签
&.tw-bg-green {
background-color: ${themeVars.github.bgColor.success.emphasis} !important;
border-color: ${themeVars.github.bgColor.success.emphasis} !important;
}
// 时间线关闭状态标签
&.tw-bg-red {
background-color: ${themeVars.github.bgColor.done.emphasis} !important;
border-color: ${themeVars.github.bgColor.done.emphasis} !important;
}
// 时间线合并状态标签
&.tw-bg-purple {
background-color: ${themeVars.github.bgColor.done.emphasis} !important;
border-color: ${themeVars.github.bgColor.done.emphasis} !important;
}
}
}
// 工单&PR状态标签
.ui.label.issue-state-label {
border-radius: 25px !important;
&.green {
color: ${themeVars.color.text.self} !important;
background-color: ${themeVars.github.bgColor.success.emphasis} !important;
border-color: ${themeVars.github.bgColor.success.emphasis} !important;
}
&.red {
color: ${themeVars.color.text.self} !important;
background-color: ${themeVars.github.bgColor.done.emphasis} !important;
border-color: ${themeVars.github.bgColor.done.emphasis} !important;
}
&.purple {
color: ${themeVars.color.text.self} !important;
background-color: ${themeVars.github.bgColor.done.emphasis} !important;
border-color: ${themeVars.github.bgColor.done.emphasis} !important;
}
}
`;
// PR 分支标签
export const prBranch = css`
.repository.view.issue .pull-desc code,
#issue-list .flex-item-body .branches .branch {
color: ${themeVars.github.fgColor.accent};
background-color: ${themeVars.github.bgColor.accent.muted};
font-size: 12px;
padding: 0 5px;
}
`;
// 评论
export const comment = css`
.comment {
// 去除评论标题左侧指向头像的小箭头
.comment-header,
&:target .comment-header {
&:before,
&:after {
display: none;
}
}
// 评论焦点样式
&:target {
.comment-container {
border-color: ${themeVars.github.borderColor.accent.emphasis} !important;
box-shadow: 0 0 0 1px ${themeVars.color.primary.self} !important;
}
}
.comment-header-right {
.context-dropdown {
// 评论菜单的删除按钮
.menu .item.delete-comment {
color: ${themeVars.color.red.self};
&:hover {
background-color: ${themeVars.color.red.badge.bg} !important;
color: ${themeVars.color.red.light};
}
}
}
}
}
`;
export const dropdown = css`
.repository {
// Issue/PR 列表下的所有筛选菜单
&.issue-list .ui.dropdown .menu, .ui.menu .ui.dropdown .menu,
// Issue/PR 详情下的右侧的上半部分选项菜单
&.issue.view .issue-content-right .ui.dropdown .scrolling.menu {
.item:hover:after {
content: "";
${activeItemAfterStyle}
}
}
}
`;

View File

@@ -62,8 +62,12 @@ export const releases = css`
margin-top: 1px; margin-top: 1px;
} }
} }
.js-branch-tag-selector { // 分支选择按钮
margin-top: 8px; .ui.button.branch-dropdown-button {
min-height: 20px;
line-height: 20px;
padding: 3px 12px;
font-size: 12px;
} }
} }
// 右侧发布详细信息 // 右侧发布详细信息

View File

@@ -6,13 +6,6 @@ export const repoHeader = css`
// 点星/关注/克隆/RSS 按钮 // 点星/关注/克隆/RSS 按钮
.ui.compact.button { .ui.compact.button {
padding: 3px 12px; padding: 3px 12px;
svg {
color: ${themeVars.color.text.light.num1};
}
// 文本跟图标间隔, 文本在手机下不显示
span {
margin-left: 0.5rem;
}
} }
// 仓库图标 // 仓库图标
img.ui.avatar { img.ui.avatar {
@@ -81,13 +74,13 @@ export const repoMenu = css`
export const repoTopic = css` export const repoTopic = css`
// 理应只能覆盖探索/组织/用户下仓库的 topic 标签 // 理应只能覆盖探索/组织/用户下仓库的 topic 标签
.label-list .ui.label, // 避免渲染到仓库的类型标签
.flex-item-main > .label-list .ui.label,
// 仓库文件列表下的 topic 标签 // 仓库文件列表下的 topic 标签
#repo-topics .ui.label.repo-topic { #repo-topics .ui.label.repo-topic {
border-radius: 25px; border-radius: 25px;
font-size: 12px; font-size: 12px;
padding: 5px 10px; padding: 5px 10px;
margin: 0px 1.5px 3.5px 0px;
background-color: ${themeVars.github.bgColor.accent.muted}; background-color: ${themeVars.github.bgColor.accent.muted};
color: ${themeVars.github.fgColor.accent}; color: ${themeVars.github.fgColor.accent};
&:hover { &:hover {

View File

@@ -18,12 +18,25 @@ export const baseButton = css`
min-height: 30px; min-height: 30px;
font-weight: 500; font-weight: 500;
padding: 9px 16px; padding: 9px 16px;
&.ui {
gap: 8px;
}
} }
.ui.button:not(.primary):not(.red) svg {
.ui.primary.button { color: ${themeVars.color.text.light.num1};
${primaryStyle} }
&:hover { // 主色调按钮保持白色
${primaryHoverStyle} .ui.primary.buttons .button svg {
color: ${themeVars.color.text.self};
}
.ui.primary {
&.button,
// 按钮组, PR 里的压缩合并按钮
&.buttons .button {
${primaryStyle}
&:hover {
${primaryHoverStyle}
}
} }
} }
// 主色调基本按钮和普通按钮一样 // 主色调基本按钮和普通按钮一样
@@ -76,14 +89,6 @@ export const redButton = css`
} }
`; `;
// 分支菜单按钮
export const branchDropdownButton = css`
.ui.button.branch-dropdown-button {
padding: 3px 12px;
min-height: 30px;
}
`;
// 修复按钮高度 // 修复按钮高度
export const fixButtonHeight = css` export const fixButtonHeight = css`
.ui.small.buttons .button, .ui.small.buttons .button,

View File

@@ -1,4 +1,4 @@
import { animation } from "src/core/theme"; import { animationDown, animationUp } from "src/core/theme";
import { css, otherThemeVars, themeVars } from "src/types/vars"; import { css, otherThemeVars, themeVars } from "src/types/vars";
import { activeItemAfterStyle } from "styles/public/menu"; import { activeItemAfterStyle } from "styles/public/menu";
@@ -6,7 +6,7 @@ export const dropdown = css`
.ui.dropdown, .ui.dropdown,
.ui.menu .ui.dropdown { .ui.menu .ui.dropdown {
.menu { .menu {
animation: ${animation}; animation: ${animationDown};
// 统一所有下拉菜单的样式 // 统一所有下拉菜单的样式
background-color: ${themeVars.color.menu} !important; background-color: ${themeVars.color.menu} !important;
border: unset !important; border: unset !important;
@@ -19,13 +19,15 @@ export const dropdown = css`
gap: 0.5rem; gap: 0.5rem;
padding: 8px 10px !important; padding: 8px 10px !important;
border-radius: ${otherThemeVars.border.radius} !important; border-radius: ${otherThemeVars.border.radius} !important;
margin: 0 0.5rem; &:not(.emoji) {
&:first-of-type { margin: 0 0.5rem;
}
&:not(.emoji):first-of-type {
margin-top: 0.5rem; margin-top: 0.5rem;
} }
// 不知道为什么提交差异对比页面操作中的 cherrypick 按钮无法被选中 // 不知道为什么提交差异对比页面操作中的 cherrypick 按钮无法被选中
&.cherry-pick-button, &.cherry-pick-button,
&:last-of-type { &:not(.emoji):last-of-type {
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
} }
&:hover { &:hover {
@@ -37,10 +39,6 @@ export const dropdown = css`
background-color: ${themeVars.github.control.transparent.bgColor.hover} !important; background-color: ${themeVars.github.control.transparent.bgColor.hover} !important;
} }
} }
svg {
color: ${themeVars.color.text.light.num1};
margin-right: 0.5rem;
}
&.active, &.active,
&.selected { &.selected {
&:after { &:after {
@@ -68,6 +66,7 @@ export const dropdown = css`
.ui.dropdown.upward, .ui.dropdown.upward,
.ui.menu .ui.dropdown.upward { .ui.menu .ui.dropdown.upward {
.menu { .menu {
animation: ${animationUp};
margin-bottom: 0.35em !important; margin-bottom: 0.35em !important;
} }
} }
@@ -142,7 +141,7 @@ export const selectionDropdown = css`
outline: none; outline: none;
} }
// 覆盖选择输入框向上弹出时的 hover 效果, 原阴影会覆盖加厚的边框线 // 覆盖选择输入框向上弹出时的 hover 效果, 原阴影会覆盖加厚的边框线
.ui.upward.active.selection.dropdown:hover { .ui.selection.dropdown.active.search.upward:hover {
box-shadow: inset 0 0 0 1px ${themeVars.github.borderColor.accent.emphasis}; box-shadow: inset 0 0 0 1px ${themeVars.github.borderColor.accent.emphasis};
} }
// 由于之前的排除导致样式优先级变高, 小按钮去除圆角 // 由于之前的排除导致样式优先级变高, 小按钮去除圆角
@@ -154,10 +153,52 @@ export const selectionDropdown = css`
border-bottom-left-radius: ${otherThemeVars.border.radius} !important; border-bottom-left-radius: ${otherThemeVars.border.radius} !important;
border-bottom-right-radius: ${otherThemeVars.border.radius} !important; border-bottom-right-radius: ${otherThemeVars.border.radius} !important;
} }
// 修复因为上面的排除导致的圆角问题
// 具体工单页面下依赖菜单选择框
#new-dependency-drop-list.ui.selection.dropdown.active,
// 提交图分支选择框
#git-graph-container #flow-select-refs-dropdown {
border-bottom-right-radius: 0 !important;
}
// 修复选择框的下拉菜单向上显示时的样式问题 // 修复选择框的下拉菜单向上显示时的样式问题
.ui.upward.selection.dropdown.visible:not(.small), .ui.upward.selection.dropdown.visible:not(.small),
.ui.active.upward.selection.dropdown:not(.small) { .ui.active.upward.selection.dropdown:not(.small) {
border-top-left-radius: ${otherThemeVars.border.radius}!important; border-top-left-radius: ${otherThemeVars.border.radius} !important;
border-top-right-radius: ${otherThemeVars.border.radius}!important; border-top-right-radius: ${otherThemeVars.border.radius} !important;
}
`;
export const fixSelectionDropdown = css`
// 具体工单页面下依赖菜单选择框
#new-dependency-drop-list.ui.selection.dropdown {
// 高度对齐问题, 应该与 input 框高度一致
min-height: 32px;
}
`;
// 分支菜单
export const branchDropdown = css`
.ui.dropdown.branch-selector-dropdown .menu > .item {
animation: ${animationDown};
}
`;
// 包含表情的下拉菜单
export const emojiDropdown = css`
.ui.dropdown.action.select-reaction.active .menu:has(.emoji) {
display: flex !important;
flex-direction: row;
gap: 4px;
padding: 4px;
min-width: auto;
> .item.emoji {
font-size: 14px;
min-height: 32px;
height: 32px;
margin: 0px;
&:hover {
background-color: ${themeVars.github.bgColor.accent.emphasis} !important;
}
}
} }
`; `;

View File

@@ -2,6 +2,7 @@
// tslint:disable:ordered-imports // tslint:disable:ordered-imports
// 组件导入有顺序, 禁止插件优化 // 组件导入有顺序, 禁止插件优化
import "./radius"; // 圆角, 此样式为基础样式, 确保在其他样式之前导入 import "./radius"; // 圆角, 此样式为基础样式, 确保在其他样式之前导入
import "./transition"; // 过渡效果
import "./text"; // 文本或 SVG 的基本颜色 import "./text"; // 文本或 SVG 的基本颜色
import "./button"; // 按钮 import "./button"; // 按钮
import "./chroma"; // 代码高亮 import "./chroma"; // 代码高亮

View File

@@ -110,6 +110,9 @@ export const verticalMenu = css`
`; `;
export const menu = css` export const menu = css`
.menu .item svg {
color: ${themeVars.color.text.light.num1};
}
// 菜单默认悬浮色更改 // 菜单默认悬浮色更改
.ui.menu a.item, .ui.menu a.item,
.ui.secondary.pointing.menu a.item, .ui.secondary.pointing.menu a.item,
@@ -168,7 +171,6 @@ export const secondaryMenu = css`
border-radius: ${otherThemeVars.border.radius}; border-radius: ${otherThemeVars.border.radius};
color: ${themeVars.color.text.self}; color: ${themeVars.color.text.self};
svg { svg {
color: ${themeVars.color.text.light.num1};
margin-right: 8px; margin-right: 8px;
} }
} }

View File

@@ -1,7 +1,9 @@
import { animationDown } from "src/core/theme";
import { css, themeVars } from "src/types/vars"; import { css, themeVars } from "src/types/vars";
export const modal = css` export const modal = css`
.ui.modal { .ui.modal {
animation: ${animationDown};
border: 1.5px solid ${themeVars.color.light.border}; border: 1.5px solid ${themeVars.color.light.border};
> .header { > .header {

View File

@@ -1,4 +1,4 @@
import { css, themeVars } from "src/types/vars"; import { css, otherThemeVars, themeVars } from "src/types/vars";
export const navbarRight = css` export const navbarRight = css`
#navbar { #navbar {
@@ -13,6 +13,7 @@ export const navbarRight = css`
align-content: center; align-content: center;
justify-content: center; justify-content: center;
border: 1px solid ${themeVars.color.light.border}; border: 1px solid ${themeVars.color.light.border};
border-radius: ${otherThemeVars.border.radius};
padding: unset; padding: unset;
height: 32px; height: 32px;
min-width: 32px; min-width: 32px;

View File

@@ -78,8 +78,10 @@ export const radiusImportant = css`
border-radius: ${otherThemeVars.border.radius} !important; border-radius: ${otherThemeVars.border.radius} !important;
} }
// 目前为仓库列表/探索的二级菜单, 改版需要替换为全圆角 // 目前为仓库列表/探索的二级菜单, 改版需要替换为全圆角
.ui.tabular.menu .active.item { .ui.secondary.tabular.menu .item {
border-radius: ${otherThemeVars.border.radius} !important; border-radius: ${otherThemeVars.border.radius} !important;
&.active,
&.active:hover,
&:hover { &:hover {
border-radius: ${otherThemeVars.border.radius} !important; border-radius: ${otherThemeVars.border.radius} !important;
} }
@@ -113,10 +115,10 @@ export const radiusTop = css`
// 上半部分圆角替换(原CSS带!important) // 上半部分圆角替换(原CSS带!important)
export const radiusTopImportant = css` export const radiusTopImportant = css`
.ui.tabular.menu .item,
.ui.simple.upward.dropdown { .ui.simple.upward.dropdown {
&.active { &.active,
border-radius: ${otherThemeVars.border.radius} ${otherThemeVars.border.radius} 0 0 !important; &.active:hover,
}
&:hover { &:hover {
border-radius: ${otherThemeVars.border.radius} ${otherThemeVars.border.radius} 0 0 !important; border-radius: ${otherThemeVars.border.radius} ${otherThemeVars.border.radius} 0 0 !important;
} }

View File

@@ -1,4 +1,4 @@
import { animation } from "src/core/theme"; import { animationDown } from "src/core/theme";
import { css, otherThemeVars, themeVars } from "src/types/vars"; import { css, otherThemeVars, themeVars } from "src/types/vars";
// 一些界面内的提示框, 比如克隆按钮, PR信息, Runner信息 等 // 一些界面内的提示框, 比如克隆按钮, PR信息, Runner信息 等
@@ -7,7 +7,7 @@ export const tippyBox = css`
margin-top: -3px; margin-top: -3px;
border-radius: 12px; border-radius: 12px;
overflow: hidden; overflow: hidden;
animation: ${animation}; animation: ${animationDown};
// 边框线同步 github 样式 // 边框线同步 github 样式
&[data-theme="default"], &[data-theme="default"],
&[data-theme="box-with-header"] { &[data-theme="box-with-header"] {

View File

@@ -1,45 +0,0 @@
// Made by Luting ^-^
@keyframes overlay-appear {
0% {
opacity: 0;
transform: translateY(-12px);
}
100% {
opacity: 1;
transform: translateY(0);
}
}
#navbar .item,
.header-wrapper .ui.tabular.menu .item,
.job-step-summary,
.job-step-logs,
.job-brief-item,
.tippy-box .flex-items-block .item,
.clone-panel-tab .item,
.ui.form select,
.ui.label,
.ui.modal,
.ui.selection.dropdown,
.ui.checkbox label:before,
.ui.checkbox input:checked ~ label:before,
.ui.checkbox input:not([type="radio"]):indeterminate ~ label:before,
.ui.selection.active.dropdown,
.ui.selection.active.dropdown:hover,
.ui.selection.active.dropdown .menu,
.ui.selection.active.dropdown:hover .menu,
.ui.vertical.menu .header.item,
.ui.secondary.menu .item {
transition: 0.12s ease-out;
}
textarea,
.ui.form input,
.menu .item,
.ui.modal,
.job-step-summary,
.job-step-logs,
.job-brief-item {
animation: 200ms cubic-bezier(0.33, 1, 0.68, 1) 0s 1 normal none running overlay-appear;
}

View File

@@ -0,0 +1,49 @@
import { css } from "src/types/vars";
// 简单的渐变过渡
export const transition = css`
// 迁移的元素
#navbar .item,
.header-wrapper .ui.tabular.menu .item,
.job-step-summary,
.job-step-logs,
.job-brief-item,
.repo-file-cell,
.tippy-box .flex-items-block .item,
.clone-panel-tab .item,
.ui.form select,
.ui.label,
.ui.modal,
.ui.checkbox label:before,
.ui.checkbox input:checked ~ label:before,
.ui.checkbox input:not([type="radio"]):indeterminate ~ label:before,
.ui.selection.dropdown,
.ui.selection.active.dropdown,
.ui.selection.active.dropdown:hover,
.ui.selection.active.dropdown .menu,
.ui.selection.active.dropdown:hover .menu,
.ui.vertical.menu .header.item,
.ui.secondary.menu .item {
transition: 80ms cubic-bezier(0.33, 1, 0.68, 1);
}
// Gitea 表单元素原始过渡覆盖
input,
textarea,
tr,
.ui.input textarea,
.ui.form textarea,
.ui.form input:not([type]),
.ui.form input[type="date"],
.ui.form input[type="datetime-local"],
.ui.form input[type="email"],
.ui.form input[type="number"],
.ui.form input[type="password"],
.ui.form input[type="search"],
.ui.form input[type="tel"],
.ui.form input[type="time"],
.ui.form input[type="text"],
.ui.form input[type="file"],
.ui.form input[type="url"] {
transition: 80ms cubic-bezier(0.33, 1, 0.68, 1);
}
`;

View File

@@ -23,7 +23,6 @@
"verbatimModuleSyntax": true, "verbatimModuleSyntax": true,
"moduleDetection": "force", "moduleDetection": "force",
"noEmit": true, "noEmit": true,
"jsx": "react-jsx",
/* Linting */ /* Linting */
"strict": true, "strict": true,
"noUnusedLocals": true, "noUnusedLocals": true,

View File

@@ -1,5 +1,4 @@
import { vanillaExtractPlugin } from "@vanilla-extract/vite-plugin"; import { vanillaExtractPlugin } from "@vanilla-extract/vite-plugin";
import react from "@vitejs/plugin-react";
import linaria from "@wyw-in-js/vite"; import linaria from "@wyw-in-js/vite";
import * as dotenv from "dotenv"; import * as dotenv from "dotenv";
import { Features } from "lightningcss"; import { Features } from "lightningcss";
@@ -24,7 +23,7 @@ export default defineConfig(({ mode }) => {
styles: path.resolve(__dirname, "styles"), styles: path.resolve(__dirname, "styles"),
themes: path.resolve(__dirname, "themes"), themes: path.resolve(__dirname, "themes"),
}, },
extensions: [".js", ".jsx", ".ts", ".tsx", ".css.tsx"], extensions: [".js", ".ts", ".css.ts"],
}, },
css: { css: {
transformer: "lightningcss", transformer: "lightningcss",
@@ -37,14 +36,13 @@ export default defineConfig(({ mode }) => {
linaria({ linaria({
include: ["**/*.{ts,tsx}"], include: ["**/*.{ts,tsx}"],
babelOptions: { babelOptions: {
presets: ["@babel/preset-typescript", "@babel/preset-react"], presets: ["@babel/preset-typescript"],
}, },
preprocessor: (_selector, cssText) => sass.compileString(cssText).css, // 默认为全局样式并使用 sass-embedded 预处理 css preprocessor: (_selector, cssText) => sass.compileString(cssText).css, // 默认为全局样式并使用 sass-embedded 预处理 css
tagResolver: (source, tag) => tagResolver: (source, tag) =>
// 识别从 src 导出的 css 标签,使用 @linaria/core/processors/css 处理 // 识别从 src 导出的 css 标签,使用 @linaria/core/processors/css 处理
source === "src/types/vars" && tag === "css" ? require.resolve("@linaria/core/processors/css") : null, source === "src/types/vars" && tag === "css" ? require.resolve("@linaria/core/processors/css") : null,
}), }),
react(),
vanillaExtractPlugin(), vanillaExtractPlugin(),
themePlugin(), themePlugin(),
], ],