Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

style: adaptation issues in dark mode #4660

Closed
wants to merge 19 commits into from
Closed

style: adaptation issues in dark mode #4660

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
218dee0
style:Adaptation issues in dark mode
pingsanddoss Oct 17, 2024
fdd93d4
style:Adaptation issues in dark mode
pingsanddoss Oct 17, 2024
e88f0bb
style:Adaptation issues in dark mode
pingsanddoss Oct 17, 2024
7f35611
Merge branch 'main' into main
pingsanddoss Oct 17, 2024
a2e08eb
复原
pingsanddoss Oct 17, 2024
5617d7b
style:Adaptation issues in dark mode
pingsanddoss Oct 17, 2024
a1a3238
style:Adaptation issues in dark mode
pingsanddoss Oct 17, 2024
ae516b1
style:Adaptation issues in dark mode
pingsanddoss Oct 17, 2024
8a16c18
复原
pingsanddoss Oct 17, 2024
1370e92
Merge remote-tracking branch 'origin/main'
pingsanddoss Oct 17, 2024
06ef2ec
style: adaptation issues in dark mode
pingsanddoss Oct 17, 2024
4210c3e
fix: modified fixed and unfixed logic, fixed #4640
pingsanddoss Oct 18, 2024
50a1f26
Revert "fix: modified fixed and unfixed logic, fixed #4640"
pingsanddoss Oct 18, 2024
431b9f7
Merge branch 'main' into main
pingsanddoss Oct 18, 2024
f051d84
Merge branch 'main' into main
pingsanddoss Oct 19, 2024
35b947f
Merge branch 'main' into main
pingsanddoss Oct 20, 2024
ecfdb19
Merge branch 'vbenjs:main' into main
pingsanddoss Oct 28, 2024
3fd1d24
Merge branch 'vbenjs:main' into main
pingsanddoss Nov 17, 2024
0c1c9d8
Merge branch 'vbenjs:main' into main
pingsanddoss Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions packages/@core/ui-kit/menu-ui/src/components/menu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,13 +445,13 @@ $namespace: vben;
// --menu-submenu-opened-background-color: hsl(var(--menu-opened-dark));
--menu-item-background-color: var(--menu-background-color);
--menu-item-color: hsl(var(--foreground) / 80%);
--menu-item-hover-color: hsl(var(--accent-foreground));
--menu-item-hover-color: hsl(var(--primary));
--menu-item-hover-background-color: hsl(var(--accent));
--menu-item-active-color: hsl(var(--accent-foreground));
--menu-item-active-background-color: hsl(var(--accent));
--menu-submenu-hover-color: hsl(var(--foreground));
--menu-item-active-color: hsl(var(--primary));
--menu-item-active-background-color: hsl(var(--primary) / 15%);
--menu-submenu-hover-color: hsl(var(--primary));
--menu-submenu-hover-background-color: hsl(var(--accent));
--menu-submenu-active-color: hsl(var(--foreground));
--menu-submenu-active-color: hsl(var(--primary));
--menu-submenu-active-background-color: transparent;
pingsanddoss marked this conversation as resolved.
Show resolved Hide resolved
--menu-submenu-background-color: var(--menu-background-color);
}
Expand All @@ -461,7 +461,7 @@ $namespace: vben;
// --menu-submenu-opened-background-color: hsl(var(--menu-opened));
--menu-item-background-color: var(--menu-background-color);
--menu-item-color: hsl(var(--foreground));
--menu-item-hover-color: var(--menu-item-color);
--menu-item-hover-color: hsl(var(--primary));
--menu-item-hover-background-color: hsl(var(--accent));
--menu-item-active-color: hsl(var(--primary));
--menu-item-active-background-color: hsl(var(--primary) / 15%);
Expand Down Expand Up @@ -498,13 +498,13 @@ $namespace: vben;
--menu-background-color: transparent;

&.is-dark {
--menu-item-hover-color: hsl(var(--accent-foreground));
--menu-item-hover-color: hsl(var(--primary));
--menu-item-hover-background-color: hsl(var(--accent));
--menu-item-active-color: hsl(var(--accent-foreground));
--menu-item-active-background-color: hsl(var(--accent));
--menu-submenu-active-color: hsl(var(--foreground));
--menu-submenu-active-background-color: hsl(var(--accent));
--menu-submenu-hover-color: hsl(var(--accent-foreground));
--menu-item-active-color: hsl(var(--primary));
--menu-item-active-background-color: hsl(var(--primary) / 15%);
--menu-submenu-active-color: hsl(var(--primary));
--menu-submenu-active-background-color: hsl(var(--primary) / 15%);
--menu-submenu-hover-color: hsl(var(--primary));
--menu-submenu-hover-background-color: hsl(var(--accent));
}

Expand Down
4 changes: 2 additions & 2 deletions packages/@core/ui-kit/menu-ui/src/components/normal-menu/normal-menu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ $namespace: vben;
// color: hsl(var(--foreground) / 80%);

&:not(.is-active):hover {
@apply text-foreground;
@apply text-primary;
}

&.is-active {
.#{$namespace}-normal-menu__name,
.#{$namespace}-normal-menu__icon {
@apply text-foreground;
@apply text-primary;
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/@core/ui-kit/tabs-ui/src/components/tabs-chrome/tabs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ const tabsView = computed((): TabConfig[] => {
class="tabs-chrome__background absolute z-[-1] size-full px-[calc(var(--gap)-1px)] py-0 transition-opacity duration-150"
>
<div
class="tabs-chrome__background-content group-[.is-active]:bg-primary/15 dark:group-[.is-active]:bg-accent h-full rounded-tl-[var(--gap)] rounded-tr-[var(--gap)] duration-150"
class="tabs-chrome__background-content group-[.is-active]:bg-primary/15 dark:group-[.is-active]:bg-primary/15 h-full rounded-tl-[var(--gap)] rounded-tr-[var(--gap)] duration-150"
></div>
<svg
class="tabs-chrome__background-before group-[.is-active]:fill-primary/15 dark:group-[.is-active]:fill-accent absolute bottom-0 left-[-1px] fill-transparent transition-all duration-150"
class="tabs-chrome__background-before group-[.is-active]:fill-primary/15 dark:group-[.is-active]:fill-primary/15 absolute bottom-0 left-[-1px] fill-transparent transition-all duration-150"
height="7"
width="7"
>
Expand Down Expand Up @@ -136,7 +136,7 @@ const tabsView = computed((): TabConfig[] => {

<!-- tab-item-main -->
<div
class="tabs-chrome__item-main group-[.is-active]:text-primary dark:group-[.is-active]:text-accent-foreground text-accent-foreground z-[2] mx-[calc(var(--gap)*2)] my-0 flex h-full items-center overflow-hidden rounded-tl-[5px] rounded-tr-[5px] pl-2 pr-4 duration-150"
class="tabs-chrome__item-main group-[.is-active]:text-primary dark:group-[.is-active]:text-primary text-accent-foreground z-[2] mx-[calc(var(--gap)*2)] my-0 flex h-full items-center overflow-hidden rounded-tl-[5px] rounded-tr-[5px] pl-2 pr-4 duration-150"
>
<VbenIcon
v-if="showIcon"
Expand Down
15 changes: 14 additions & 1 deletion packages/stores/src/modules/tabbar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,14 @@ export const useTabbarStore = defineStore('core-tabbar', {
// this.addTab(tab);
this.tabs.splice(index, 1, tab);
}
// 过滤固定tabs，后面更改affixTabOrder的值的话可能会有问题，目前行464排序affixTabs没有设置值
const affixTabs = this.tabs.filter((tab) => isAffixTab(tab));
// 获得固定tabs的index
const newIndex = affixTabs.findIndex(
(item) => getTabPath(item) === getTabPath(tab),
);
// 交换位置重新排序
await this.sortTabs(index, newIndex);
pingsanddoss marked this conversation as resolved.
Show resolved Hide resolved
},

/**
Expand Down Expand Up @@ -411,14 +419,19 @@ export const useTabbarStore = defineStore('core-tabbar', {
const index = this.tabs.findIndex(
(item) => getTabPath(item) === getTabPath(tab),
);

if (index !== -1) {
const oldTab = this.tabs[index];
tab.meta.affixTab = false;
tab.meta.title = oldTab?.meta?.title as string;
// this.addTab(tab);
this.tabs.splice(index, 1, tab);
}
// 过滤固定tabs，后面更改affixTabOrder的值的话可能会有问题，目前行464排序affixTabs没有设置值
const affixTabs = this.tabs.filter((tab) => isAffixTab(tab));
// 获得固定tabs的index,使用固定tabs的下一个位置也就是活动tabs的第一个位置
const newIndex = affixTabs.length;
// 交换位置重新排序
await this.sortTabs(index, newIndex);
pingsanddoss marked this conversation as resolved.
Show resolved Hide resolved
},

/**
Expand Down