diff --git a/src/components/NavBar/style/index.module.less b/src/components/NavBar/style/index.module.less index ee6778d..92a606c 100644 --- a/src/components/NavBar/style/index.module.less +++ b/src/components/NavBar/style/index.module.less @@ -10,6 +10,8 @@ .left { display: flex; align-items: center; + flex: 1; + min-width: 0; } .logo { @@ -30,6 +32,56 @@ white-space: nowrap; } +.navbar-breadcrumb { + display: flex; + align-items: center; + gap: 6px; + margin-left: 24px; + font-size: 15px; + color: var(--color-text-2); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + flex: 1; + min-width: 0; +} + +.breadcrumb-node { + color: var(--color-text-2); + transition: color 0.2s; + white-space: nowrap; + display: inline-flex; + align-items: center; + gap: 6px; +} + +.breadcrumb-clickable { + cursor: pointer; +} + +.breadcrumb-clickable:hover { + color: var(--color-text-1); +} + +.breadcrumb-node:last-of-type { + color: var(--color-text-1); + font-weight: 600; + cursor: default; +} + +.breadcrumb-divider { + color: var(--color-text-4); + margin: 0 2px; + white-space: nowrap; +} + +.breadcrumb-icon { + color: var(--color-text-3); + display: inline-flex; + align-items: center; + font-size: 16px; +} + .right { display: flex; list-style: none; diff --git a/src/components/Pagination/style/index.module.less b/src/components/Pagination/style/index.module.less index 259c84c..b055377 100644 --- a/src/components/Pagination/style/index.module.less +++ b/src/components/Pagination/style/index.module.less @@ -2,59 +2,52 @@ display: flex; justify-content: flex-end; align-items: center; - padding: 16px 0; + padding: 12px 0; // 覆盖 Arco Design 分页组件的样式 :global { .arco-pagination { display: flex; align-items: center; - gap: 8px; + gap: 4px; // 总数显示 .arco-pagination-total-text { - font-size: 14px; + font-size: 13px; color: #4e5969; - margin-right: 16px; + margin-right: 8px; } // 页码按钮样式 .arco-pagination-item { - min-width: 36px; - height: 36px; - line-height: 36px; - padding: 0; + min-width: 30px; + height: 30px; + line-height: 30px; + padding: 0 8px; margin: 0 4px; - border: none; - border-radius: 8px; - background-color: #f2f3f5; - color: #4e5969; + border: 1px solid #d0d5dd; + border-radius: 4px; + background-color: #fff; + color: #475467; font-weight: 500; transition: all 0.2s ease; &:hover { - background-color: #e5e6eb; + border-color: #a0aec0; color: #1d2129; } // 当前选中的页码 &.arco-pagination-item-active { - background: linear-gradient( - 135deg, - rgb(var(--arcoblue-6)) 0%, - rgb(var(--arcoblue-7)) 100% - ); + background: rgb(var(--arcoblue-6)); + border-color: rgb(var(--arcoblue-6)); color: #fff; font-weight: 600; - box-shadow: 0 2px 8px rgba(var(--arcoblue-6), 0.3); + box-shadow: none; &:hover { - background: linear-gradient( - 135deg, - rgb(var(--arcoblue-7)) 0%, - rgb(var(--arcoblue-8)) 100% - ); - box-shadow: 0 4px 12px rgba(var(--arcoblue-6), 0.4); + background: rgb(var(--arcoblue-5)); + border-color: rgb(var(--arcoblue-5)); } } @@ -73,9 +66,9 @@ // 省略号 .arco-pagination-item-jumper { - min-width: 36px; - height: 36px; - line-height: 36px; + min-width: 30px; + height: 30px; + line-height: 30px; border: none; background-color: transparent; color: #86909c; @@ -84,19 +77,20 @@ // 上一页/下一页按钮 .arco-pagination-item-previous, .arco-pagination-item-next { - min-width: 36px; - height: 36px; - border: none; - border-radius: 8px; - background-color: #f2f3f5; + min-width: 30px; + height: 30px; + border: 1px solid #d0d5dd; + border-radius: 4px; + background-color: #fff; transition: all 0.2s ease; + margin: 0 4px; .arco-icon { - color: #4e5969; + color: #475467; } &:not(.arco-pagination-item-disabled):hover { - background-color: #e5e6eb; + border-color: #a0aec0; .arco-icon { color: #1d2129; @@ -115,36 +109,35 @@ // 每页显示数量选择器 .arco-pagination-size-changer { - margin-left: 16px; + margin-left: 8px; .arco-select-view { - border-radius: 8px; - background-color: #f2f3f5; - border: none; + border-radius: 4px; + background-color: #fff; + border: 1px solid #d0d5dd; &:hover { - background-color: #e5e6eb; + border-color: #a0aec0; } } } // 跳转输入框 .arco-pagination-jumper { - margin-left: 16px; + margin-left: 8px; .arco-pagination-jumper-input { .arco-input-inner-wrapper { - border-radius: 8px; - background-color: #f2f3f5; - border: none; + border-radius: 4px; + background-color: #fff; + border: 1px solid #d0d5dd; &:hover { - background-color: #e5e6eb; + border-color: #a0aec0; } &:focus-within { - background-color: #fff; - border: 1px solid rgb(var(--arcoblue-6)); + border-color: rgb(var(--arcoblue-6)); } } } diff --git a/src/components/TabBar/index.module.less b/src/components/TabBar/index.module.less index b0cc586..b533ce3 100644 --- a/src/components/TabBar/index.module.less +++ b/src/components/TabBar/index.module.less @@ -1,10 +1,11 @@ .tab-bar { display: flex; align-items: center; - height: 48px; - background-color: var(--color-bg-2); - border-bottom: 1px solid var(--color-border); - padding: 0 16px; + min-height: 40px; + background-color: transparent; + border-bottom: none; + padding: 0 10px; + margin-bottom: 16px; overflow-x: auto; overflow-y: hidden; @@ -26,15 +27,18 @@ align-items: center; gap: 8px; height: 100%; + width: 100%; } .tab-item { display: inline-flex; align-items: center; - height: 32px; + height: 34px; padding: 0 16px; - background-color: var(--color-fill-2); - border-radius: 16px; + background-color: #f4f6fb; + border-radius: 999px; + border: none; + box-shadow: none; cursor: pointer; user-select: none; transition: all 0.3s cubic-bezier(0.34, 0.69, 0.1, 1); @@ -43,35 +47,26 @@ color: var(--color-text-2); &:hover { - background-color: var(--color-fill-3); - transform: translateY(-1px); + color: var(--color-text-1); } &.tab-item-active { - background: linear-gradient( - 135deg, - rgb(var(--primary-6)) 0%, - rgb(var(--primary-5)) 100% - ); - color: #fff; + background: rgba(22, 93, 255, 10%); + color: rgb(var(--primary-6)); font-weight: 500; - box-shadow: 0 2px 8px rgba(var(--primary-6), 0.3); + border: none; + box-shadow: none; &:hover { - background: linear-gradient( - 135deg, - rgb(var(--primary-5)) 0%, - rgb(var(--primary-4)) 100% - ); - box-shadow: 0 4px 12px rgba(var(--primary-6), 0.4); + background: rgba(22, 93, 255, 15%); } .tab-close { - color: rgba(255, 255, 255, 80%); + color: rgb(var(--primary-6)); &:hover { color: #fff; - background-color: rgba(255, 255, 255, 20%); + background-color: rgba(22, 93, 255, 25%); } } } @@ -92,13 +87,13 @@ height: 16px; margin-left: 8px; border-radius: 50%; - color: var(--color-text-3); + color: var(--color-text-2); transition: all 0.2s; font-size: 12px; &:hover { - color: var(--color-text-1); - background-color: var(--color-fill-3); + color: rgb(var(--primary-6)); + background-color: rgba(22, 93, 255, 12%); } } } diff --git a/src/style/layout.module.less b/src/style/layout.module.less index d467372..aa7ddf8 100644 --- a/src/style/layout.module.less +++ b/src/style/layout.module.less @@ -122,11 +122,7 @@ } .layout-content-wrapper { - padding: 16px 20px 0; -} - -.layout-breadcrumb { - margin-bottom: 16px; + padding: 16px 24px 24px; } .spin {