From 47c906e52607ddd89a3c12a4bf90e33ca9579e7d Mon Sep 17 00:00:00 2001
From: birt <2499248221@qq.com>
Date: 星期日, 13 四月 2025 22:41:01 +0800
Subject: [PATCH] 123
---
zhitan-vue/src/layout/components/AppMain.vue | 5 +
zhitan-vue/src/layout/components/TagsView/index.vue | 152 +++++++++++++-------------------------------------
zhitan-vue/src/layout/components/TagsView/ScrollPane.vue | 2
zhitan-vue/src/layout/index.vue | 8 ++
4 files changed, 52 insertions(+), 115 deletions(-)
diff --git a/zhitan-vue/src/layout/components/AppMain.vue b/zhitan-vue/src/layout/components/AppMain.vue
index fb2159e..220b6cc 100644
--- a/zhitan-vue/src/layout/components/AppMain.vue
+++ b/zhitan-vue/src/layout/components/AppMain.vue
@@ -29,6 +29,7 @@
background: #110f2e;
padding: 14px;
box-sizing: border-box;
+ padding-top: 8px;
}
.fixed-header + .app-main {
@@ -42,7 +43,7 @@
}
.fixed-header + .app-main {
- padding-top: 130px;
+ padding-top: 108px; /* 60px(navbar) + 34px(tagsview) + 14px(鍐呰竟璺�) */
}
}
}
@@ -70,7 +71,7 @@
}
.fixed-header + .app-main {
- padding-top: 130px;
+ padding-top: 108px; /* 60px(navbar) + 34px(tagsview) + 14px(鍐呰竟璺�) */
}
}
}
diff --git a/zhitan-vue/src/layout/components/TagsView/ScrollPane.vue b/zhitan-vue/src/layout/components/TagsView/ScrollPane.vue
index d7f58cc..8af4525 100644
--- a/zhitan-vue/src/layout/components/TagsView/ScrollPane.vue
+++ b/zhitan-vue/src/layout/components/TagsView/ScrollPane.vue
@@ -99,7 +99,7 @@
bottom: 0px;
}
:deep(.el-scrollbar__wrap) {
- height: 40px !important;
+ height: 34px !important;
}
}
</style>
\ No newline at end of file
diff --git a/zhitan-vue/src/layout/components/TagsView/index.vue b/zhitan-vue/src/layout/components/TagsView/index.vue
index c7dcb73..7688967 100644
--- a/zhitan-vue/src/layout/components/TagsView/index.vue
+++ b/zhitan-vue/src/layout/components/TagsView/index.vue
@@ -232,119 +232,49 @@
</script>
<style lang="scss" scoped>
-.themeDark {
- .tags-view-container {
- height: 40px;
- width: 100%;
- background: #1a235d;
- // border-bottom: 1px solid #d8dce5;
- box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
- .tags-view-wrapper {
- .tags-view-item {
- display: inline-block;
- position: relative;
- cursor: pointer;
- height: 32px;
- line-height: 30px;
- border: 1px solid #5278f5;
- color: #fff;
- // background: #3271eb;
- padding: 0 12px;
- font-size: 14px;
- margin-left: 6px;
- margin-top: 10px;
- border-radius: 4px;
- font-family: OPPOSans, OPPOSans;
- &:first-of-type {
- margin-left: 16px;
- }
- &:last-of-type {
- margin-right: 15px;
- }
- &.active {
- background-color: #4e77f8 !important;
- color: #fff;
- border-color: #4e77f8 !important;
- &::before {
- content: "";
- background: #fff;
- display: inline-block;
- width: 8px;
- height: 8px;
- border-radius: 50%;
- position: relative;
- margin-right: 5px;
- }
- }
- }
- }
- .contextmenu {
- margin: 0;
+.tags-view-container {
+ height: 34px;
+ width: calc(100% - 42px);
+ margin-top: 10px;
+ margin-left: 14px;
+ box-sizing: border-box;
+ // 娣诲姞姘村钩鍐呰竟璺濅笌app-main鐨勫唴杈硅窛涓�鑷�
+ background: #0A3465;
+
+ box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+ .tags-view-wrapper {
+ .tags-view-item {
+ display: inline-block;
+ position: relative;
+ cursor: pointer;
+ height: 26px;
+ line-height: 26px;
+ border: 1px solid #d8dce5;
+ color: #495060;
background: #fff;
- z-index: 3000;
- position: absolute;
- list-style-type: none;
- padding: 5px 0;
- border-radius: 4px;
+ padding: 0 8px;
font-size: 12px;
- font-weight: 400;
- color: #333;
- box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
- li {
- margin: 0;
- padding: 7px 16px;
- cursor: pointer;
- &:hover {
- background: #eee;
- }
+ margin-left: 5px;
+ margin-top: 4px;
+ &:first-of-type {
+ margin-left: 5px;
}
- }
- }
-}
-
-.themeLight {
- .tags-view-container {
- height: 52px;
- width: 100%;
- background: #fff;
- // border-bottom: 1px solid #d8dce5;
- box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
- .tags-view-wrapper {
- .tags-view-item {
- display: inline-block;
- position: relative;
- cursor: pointer;
- height: 32px;
- line-height: 30px;
- border: 1px solid #d8dce5;
- color: #495060;
- background: #fff;
- padding: 0 12px;
- font-size: 14px;
- margin-left: 6px;
- margin-top: 10px;
- border-radius: 4px;
- font-family: OPPOSans, OPPOSans;
- &:first-of-type {
- margin-left: 16px;
- }
- &:last-of-type {
- margin-right: 15px;
- }
- &.active {
- background-color: #42b983;
- color: #fff;
- border-color: #42b983;
- &::before {
- content: "";
- background: #fff;
- display: inline-block;
- width: 8px;
- height: 8px;
- border-radius: 50%;
- position: relative;
- margin-right: 5px;
- }
+ &:last-of-type {
+ margin-right: 5px;
+ }
+ &.active {
+ background-color: #42b983;
+ color: #fff;
+ border-color: #42b983;
+ &::before {
+ content: "";
+ background: #fff;
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ border-radius: 50%;
+ position: relative;
+ margin-right: 2px;
}
}
}
@@ -401,6 +331,6 @@
}
.scroll-container .el-scrollbar__wrap {
- height: 50px !important;
+ height: 34px !important;
}
</style>
diff --git a/zhitan-vue/src/layout/index.vue b/zhitan-vue/src/layout/index.vue
index 96046dc..90aaa04 100644
--- a/zhitan-vue/src/layout/index.vue
+++ b/zhitan-vue/src/layout/index.vue
@@ -311,13 +311,19 @@
top: 60px;
right: 0;
z-index: 9;
- width: 100%;
+ width: calc(100% - #{$base-sidebar-width});
transition: width 0.28s;
display: flex;
flex-direction: column;
+ box-sizing: border-box;
+ padding: 0;
}
.hideSidebar .fixed-header {
+ width: calc(100% - 54px);
+}
+
+.sidebarHide .fixed-header {
width: 100%;
}
--
Gitblit v1.9.3