Skip to content

[pull] master from zxwk1998:master #306

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

Open
pull wants to merge 37 commits into
base: master
Choose a base branch
from
Open

[pull] master from zxwk1998:master #306

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
66ed7c0
♻️ refactor: theme
zxwk1998 Jul 28, 2025
82ff960
♻️ refactor: theme
zxwk1998 Jul 28, 2025
6a2a79e
♻️ refactor: code
zxwk1998 Jul 28, 2025
661c241
♻️ refactor: code
zxwk1998 Jul 28, 2025
0c5f4b1
♻️ refactor: code
zxwk1998 Jul 28, 2025
117fa7f
♻️ refactor: code
zxwk1998 Jul 28, 2025
47409a2
♻️ refactor: code
zxwk1998 Jul 28, 2025
77f7558
♻️ refactor: code
zxwk1998 Jul 28, 2025
9781e37
♻️ refactor: code
zxwk1998 Jul 28, 2025
1682c6b
♻️ refactor: code
zxwk1998 Jul 31, 2025
2858f13
♻️ refactor: code
zxwk1998 Aug 1, 2025
0a64424
♻️ refactor: code
zxwk1998 Aug 1, 2025
0f549c8
♻️ refactor: code
zxwk1998 Aug 1, 2025
404235a
♻️ refactor: code
zxwk1998 Aug 1, 2025
8135fca
♻️ refactor: code
zxwk1998 Aug 1, 2025
1bb282b
♻️ refactor: code
zxwk1998 Aug 4, 2025
e95e579
♻️ refactor: code
zxwk1998 Aug 4, 2025
a2f5c28
♻️ refactor: code
zxwk1998 Aug 4, 2025
e0b21cf
♻️ refactor: code
zxwk1998 Aug 4, 2025
a15a6f4
♻️ refactor: code
zxwk1998 Aug 7, 2025
4f21ad2
♻️ refactor: code
zxwk1998 Aug 10, 2025
f6a66ee
♻️ refactor: code
zxwk1998 Aug 12, 2025
ed77235
♻️ refactor: code
zxwk1998 Aug 26, 2025
a1df9c1
♻️ refactor: code
zxwk1998 Aug 26, 2025
fb2dd5a
♻️ refactor: code
zxwk1998 Aug 26, 2025
21a824e
♻️ refactor: code
zxwk1998 Sep 9, 2025
4deb545
♻️ refactor: code
zxwk1998 Sep 12, 2025
81efbbe
♻️ refactor: code
zxwk1998 Sep 16, 2025
5cddadf
♻️ refactor: code
zxwk1998 Oct 7, 2025
5f1ef71
♻️ refactor: code
zxwk1998 Oct 15, 2025
79cb658
♻️ refactor: code
zxwk1998 Oct 27, 2025
fbdaf41
♻️ refactor: code
zxwk1998 Nov 12, 2025
77dbcf4
♻️ refactor: code
zxwk1998 Nov 18, 2025
cf136b5
♻️ refactor: code
zxwk1998 Nov 27, 2025
583b61d
♻️ refactor: code
zxwk1998 Dec 5, 2025
644dc80
♻️ refactor: code
zxwk1998 Dec 15, 2025
8f62e62
♻️ refactor: code
zxwk1998 Dec 15, 2025
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
Prev Previous commit
Next Next commit
♻️ refactor: code
  • Loading branch information
@zxwk1998
zxwk1998 committed Aug 4, 2025
commit 1bb282b1f1d6b646f57c917c453ea0f77e89c9c2
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"jsencrypt": "^3.3.2",
"layouts": "file:layouts",
"lodash": "^4.17.21",
"marked": "^16.1.1",
"marked": "^16.1.2",
"mockjs": "^1.1.0",
"nprogress": "^0.2.0",
"qrcode": "^1.5.4",
Expand Down Expand Up @@ -68,7 +68,7 @@
"eslint-plugin-vue": "^9.1.1",
"fs-extra": "^11.3.0",
"html-rspack-plugin": "^6.1.2",
"lint-staged": "^16.1.2",
"lint-staged": "^16.1.4",
"path-browserify": "^1.0.1",
"prettier": "^2.8.8",
"sass": "~1.32.13",
Expand Down
30 changes: 15 additions & 15 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

97 changes: 45 additions & 52 deletions src/layouts/components/VabNav/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@
padding-left: $base-padding;
overflow: hidden;
user-select: none;
background: rgba(255, 255, 255, 0.8);
background: rgba(255, 255, 255, 0.85);
backdrop-filter: blur(20px) saturate(180%);
-webkit-backdrop-filter: blur(20px) saturate(180%);
border-bottom: 1px solid rgba(255, 255, 255, 0.3);
box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06), inset 0 1px 0 rgba(255, 255, 255, 0.6);
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 8px rgba(0, 0, 0, 0.06), 0 4px 12px rgba(0, 0, 0, 0.04), inset 0 1px 0 rgba(255, 255, 255, 0.6);

&::before {
content: '';
Expand All @@ -92,7 +92,7 @@
left: 0;
right: 0;
bottom: 0;
background: linear-gradient(135deg, rgba(255, 255, 255, 0.4) 0%, rgba(255, 255, 255, 0.1) 50%, rgba(255, 255, 255, 0.2) 100%);
background: linear-gradient(135deg, rgba(255, 255, 255, 0.5) 0%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.3) 100%);
pointer-events: none;
}

Expand All @@ -107,22 +107,24 @@
display: flex;
align-items: center;
justify-content: center;
width: 36px;
height: 36px;
width: 38px;
height: 38px;
color: rgba(0, 0, 0, 0.7);
background: rgba(255, 255, 255, 0.6);
border: 1px solid rgba(255, 255, 255, 0.8);
background: rgba(255, 255, 255, 0.7);
border: 1px solid rgba(0, 0, 0, 0.08);
border-radius: 50%;
cursor: pointer;
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
backdrop-filter: blur(10px);
-webkit-backdrop-filter: blur(10px);
margin-right: $base-padding;

&:hover {
background: rgba(255, 255, 255, 0.8);
border-color: rgba(255, 255, 255, 1);
color: rgba(0, 0, 0, 0.9);
background: rgba(255, 255, 255, 0.9);
border-color: rgba(0, 0, 0, 0.15);
transform: translateY(-1px);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1), 0 2px 4px rgba(0, 0, 0, 0.05);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12), 0 2px 4px rgba(0, 0, 0, 0.08);
}

&:active {
Expand All @@ -139,16 +141,16 @@
align-items: center;
justify-content: flex-end;
height: $base-nav-bar-height;
gap: 8px;
gap: 12px;

::v-deep {
svg {
width: 1.2em;
height: 1.2em;
padding: 8px;
width: 1.25em;
height: 1.25em;
padding: 9px;
color: rgba(0, 0, 0, 0.7);
background: rgba(255, 255, 255, 0.6);
border: 1px solid rgba(255, 255, 255, 0.8);
background: rgba(255, 255, 255, 0.7);
border: 1px solid rgba(0, 0, 0, 0.08);
border-radius: 50%;
cursor: pointer;
fill: rgba(0, 0, 0, 0.7);
Expand All @@ -157,10 +159,11 @@
-webkit-backdrop-filter: blur(10px);

&:hover {
background: rgba(255, 255, 255, 0.8);
border-color: rgba(255, 255, 255, 1);
color: rgba(0, 0, 0, 0.9);
background: rgba(255, 255, 255, 0.9);
border-color: rgba(0, 0, 0, 0.15);
transform: translateY(-1px);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1), 0 2px 4px rgba(0, 0, 0, 0.05);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12), 0 2px 4px rgba(0, 0, 0, 0.08);
}

&:active {
Expand All @@ -172,15 +175,16 @@
button {
svg {
margin-right: 0;
color: rgba(255, 255, 255, 0.9);
background: rgba(0, 122, 255, 0.8);
border-color: rgba(0, 122, 255, 0.9);
color: rgba(255, 255, 255, 0.95);
background: linear-gradient(135deg, rgba(77, 138, 240, 0.9) 0%, rgba(52, 120, 246, 0.95) 100%);
border-color: rgba(77, 138, 240, 0.8);
cursor: pointer;
fill: rgba(255, 255, 255, 0.9);
fill: rgba(255, 255, 255, 0.95);

&:hover {
background: rgba(0, 122, 255, 0.9);
border-color: rgba(0, 122, 255, 1);
background: linear-gradient(135deg, rgba(77, 138, 240, 1) 0%, rgba(52, 120, 246, 1) 100%);
border-color: rgba(77, 138, 240, 1);
box-shadow: 0 4px 12px rgba(77, 138, 240, 0.3), 0 2px 4px rgba(77, 138, 240, 0.2);
}
}
}
Expand All @@ -189,45 +193,34 @@
margin-right: 0;

.el-button {
background: rgba(255, 255, 255, 0.6);
border: 1px solid rgba(255, 255, 255, 0.8);
background: rgba(255, 255, 255, 0.7);
border: 1px solid rgba(0, 0, 0, 0.08);
border-radius: 12px;
backdrop-filter: blur(10px);
-webkit-backdrop-filter: blur(10px);
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);

&:hover {
background: rgba(255, 255, 255, 0.8);
border-color: rgba(255, 255, 255, 1);
transform: translateY(-1px);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1), 0 2px 4px rgba(0, 0, 0, 0.05);
background: rgba(255, 255, 255, 0.9);
border-color: rgba(0, 0, 0, 0.15);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12), 0 2px 4px rgba(0, 0, 0, 0.08);
}
}
}
}
}
}

// 响应式设计
@media (max-width: 768px) {
.nav-container {
padding: 0 12px;

.left-panel {
.fold-unfold {
width: 32px;
height: 32px;
.user-name {
color: rgba(0, 0, 0, 0.8);
font-weight: 500;
}
}

.right-panel {
gap: 4px;
.user-avatar {
border: 2px solid rgba(255, 255, 255, 0.8);
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.12);
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);

::v-deep {
svg {
padding: 6px;
width: 1em;
height: 1em;
&:hover {
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15), 0 2px 4px rgba(0, 0, 0, 0.1);
transform: translateY(-1px);
}
}
}
Expand Down