diff --git a/CHANGELOG.md b/CHANGELOG.md index 0531083..5bdbeba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,3 +11,10 @@ #### More GitHub-like style - Synchronize GitHub new version of Actions list page. +- Synchronize GitHub new pagination button floating effect. +- Synchronize Clone Button Styles. + +### 🐞 Fix + +- Fix unnecessary background colors on subscription list pages under certain themes. +- Fix unnecessary spacing in the title icon of the subscription list page. diff --git a/styles/components/actions/actions.ts b/styles/components/actions/actions.ts index 0753128..2afd21c 100644 --- a/styles/components/actions/actions.ts +++ b/styles/components/actions/actions.ts @@ -61,7 +61,7 @@ const actions = css` } /* 事件触发器 */ .ui.info.attached.message { - padding: 18px 16px; + padding: 16px; max-width: calc(100% + 2px); /* Gitea 布局问题, 目的: 对齐边框 */ /* 事件触发器按钮 */ .ui.mini.button { @@ -72,9 +72,11 @@ const actions = css` } /* 工作流列表 */ .ui.attached.segment { + background: unset; padding: 0; border: 0; .run-list { + background: ${themeVars.color.box.body.self}; border: 1px solid ${themeVars.color.light.border}; border-bottom-left-radius: ${otherThemeVars.border.radius}; border-bottom-right-radius: ${otherThemeVars.border.radius}; @@ -106,6 +108,10 @@ const actions = css` &:hover { background-color: ${themeVars.color.hover.opaque}; } + &:last-child { + border-bottom-left-radius: ${otherThemeVars.border.radius}; + border-bottom-right-radius: ${otherThemeVars.border.radius}; + } .item-leading { align-self: flex-start; margin-top: 2px; @@ -130,10 +136,6 @@ const actions = css` } } } - /* 分页按钮, GitHub Gitea 修正, 不影响其他配色 */ - .center.page.buttons { - background: ${themeVars.color.body}; - } } /* 工作流队列 */ #actions-job-queue { diff --git a/styles/components/notification.ts b/styles/components/notification.ts index 1caacff..a028d04 100644 --- a/styles/components/notification.ts +++ b/styles/components/notification.ts @@ -24,11 +24,15 @@ const notification = css` .page-content.user.notification { > .ui.container { > .ui.attached.segment { + background: unset; border: 0; padding: 0; > .divider { display: none; } + > .items-with-main { + background: ${themeVars.color.box.body.self}; + } /* 订阅列表 */ &:has(#issue-list) { > .flex-left-right { @@ -61,6 +65,9 @@ const notification = css` color: ${themeVars.color.text.self}; font-weight: 700; } + .svg{ + margin-right: 0 !important; + } } } /* 右侧菜单 */ @@ -82,6 +89,18 @@ const notification = css` border-radius: ${otherThemeVars.border.radius}; > .item { padding: 16px; + &:first-of-type { + border-top-left-radius: ${otherThemeVars.border.radius}; + border-top-right-radius: ${otherThemeVars.border.radius}; + } + &:has(+ .ui.small.modal), /* Gitea BUG, 右侧通知按钮触发后, 尾部不在加载, 首页加载会占用尾部 */ + &:last-of-type { + border-bottom-left-radius: ${otherThemeVars.border.radius}; + border-bottom-right-radius: ${otherThemeVars.border.radius}; + } + &:hover { + background: ${themeVars.github.control.transparent.bgColor.hover}; + } > .item-main { gap: 4px; > .item-header { diff --git a/styles/components/repo/clone.ts b/styles/components/repo/clone.ts index 069cdf5..a39790e 100644 --- a/styles/components/repo/clone.ts +++ b/styles/components/repo/clone.ts @@ -19,8 +19,15 @@ import { css, cssCombine, customThemeVars, otherThemeVars, themeVars } from "@lutinglt/gitea-github-theme/core"; -// 克隆按钮的弹窗 -const clone = css` +/** 克隆按钮 */ +const cloneButton = css` + .ui.ui.ui.compact.primary.button[data-global-init="initRepoClonePanel"] { + padding: 0 12px; + } +`; + +/** 克隆按钮的弹窗 */ +const clonePanel = css` .tippy-box { .clone-panel-popup { /*标题和克隆地址 */ @@ -137,4 +144,4 @@ const clone = css` } `; -export default cssCombine(clone); +export default cssCombine(cloneButton, clonePanel); diff --git a/styles/public/button.ts b/styles/public/button.ts index a4ba1ab..3d30a0b 100644 --- a/styles/public/button.ts +++ b/styles/public/button.ts @@ -133,6 +133,7 @@ const fixButtonHeight = css` .repo-button-row .ui.button { min-height: 32px; height: 32px; + gap: 8px; } /* 修复因上面小按钮高度导致仓库星标克隆等按钮高度过高 */ .repo-header { diff --git a/styles/public/menu/pagination_menu.ts b/styles/public/menu/pagination_menu.ts index 82f8c5f..8bc20ae 100644 --- a/styles/public/menu/pagination_menu.ts +++ b/styles/public/menu/pagination_menu.ts @@ -43,8 +43,7 @@ const paginationMenu = css` &:not(.active) { border: 1px solid #ffffff00; &:hover { - background: unset; - border-color: ${themeVars.color.secondary.self}; + background: ${themeVars.github.control.transparent.bgColor.hover}; } } &.navigation { diff --git a/styles/public/menu/secondary_menu.ts b/styles/public/menu/secondary_menu.ts index f411bc9..d65ea93 100644 --- a/styles/public/menu/secondary_menu.ts +++ b/styles/public/menu/secondary_menu.ts @@ -42,9 +42,7 @@ const secondaryMenu = css` gap: 4px; .item { padding: 5px 8px !important; - margin-block-start: 0.5rem; - margin-block-end: 0.5rem; - margin-bottom: 0.5rem !important; + margin: 8px 0 !important; } } .item { @@ -65,7 +63,7 @@ const secondaryMenu = css` content: ""; background: ${themeVars.github.underlineNav.borderColor.active}; border-radius: ${otherThemeVars.border.radius}; - bottom: calc(50% - 1.65rem); + bottom: calc(50% - 26px); height: 2px; position: absolute; right: 50%;