调整了多个页面的工具栏样式

main
mula.liu 2026-05-22 10:31:21 +08:00
parent 9f395a10ac
commit 4b41763ef4
5 changed files with 81 additions and 40 deletions

View File

@ -8,6 +8,7 @@
height: 64px; height: 64px;
border-bottom: 1px solid var(--border-color); border-bottom: 1px solid var(--border-color);
color: var(--text-color); color: var(--text-color);
overflow: visible;
} }
/* 左侧区域 */ /* 左侧区域 */
@ -55,6 +56,50 @@
gap: 16px; gap: 16px;
} }
.workspace-header-brand {
position: relative;
height: 64px;
min-width: 360px;
padding-left: 70px;
padding-right: 36px;
display: inline-flex;
align-items: center;
gap: 14px;
}
.workspace-header-brand::before {
content: '';
position: absolute;
top: 0;
width: 1px;
height: 64px;
background: var(--border-color);
}
.workspace-header-brand::before {
left: 0;
}
.workspace-brand-icon {
font-size: 22px;
color: #6b7280;
}
.workspace-brand-title {
font-size: 18px;
font-weight: 600;
color: #4b5563;
white-space: nowrap;
}
body.dark .workspace-brand-title {
color: var(--text-color);
}
body.dark .workspace-brand-icon {
color: var(--text-color-secondary);
}
/* Icon Buttons */ /* Icon Buttons */
.header-icon-btn { .header-icon-btn {
display: flex; display: flex;
@ -151,4 +196,4 @@ body.dark .notification-item.unread:hover {
padding: 8px; padding: 8px;
border-top: 1px solid var(--border-color); border-top: 1px solid var(--border-color);
text-align: center; text-align: center;
} }

View File

@ -10,7 +10,7 @@ import {
NotificationOutlined, NotificationOutlined,
MoonOutlined, MoonOutlined,
SunOutlined, SunOutlined,
GlobalOutlined AppstoreOutlined
} from '@ant-design/icons' } from '@ant-design/icons'
import useUserStore from '@/stores/userStore' import useUserStore from '@/stores/userStore'
import useNotificationStore from '@/stores/notificationStore' import useNotificationStore from '@/stores/notificationStore'
@ -151,7 +151,12 @@ function AppHeader({ collapsed, onToggle, showLogo = true }) {
</div> </div>
</div> </div>
)} )}
{!showLogo && <div />} {/* Spacer if left is empty */} {!showLogo && (
<div className="workspace-header-brand">
<AppstoreOutlined className="workspace-brand-icon" />
<span className="workspace-brand-title">NexDocus Workspace</span>
</div>
)}
{/* 右侧:功能按钮 */} {/* 右侧:功能按钮 */}
<div className="header-right"> <div className="header-right">

View File

@ -24,4 +24,4 @@
.content-wrapper { .content-wrapper {
padding: 0; padding: 0;
min-height: 100%; min-height: 100%;
} }

View File

@ -30,39 +30,31 @@
white-space: nowrap; white-space: nowrap;
} }
/* Collapse Trigger */ .sidebar-collapse-trigger {
.collapse-trigger {
position: absolute; position: absolute;
right: -14px; right: -13px;
top: 28px; top: 32px;
width: 28px; z-index: 20;
height: 28px; width: 26px;
background: var(--bg-color); height: 26px;
border: 1px solid var(--border-color); border: 1px solid var(--border-color);
border-radius: 50%; border-radius: 999px;
display: flex; background: var(--header-bg);
color: #8a94a6;
display: inline-flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-shadow: 0 2px 8px rgba(0, 21, 41, 0.08);
cursor: pointer; cursor: pointer;
z-index: 10; transform: translateY(-50%);
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08); transition: all 0.2s;
color: var(--text-color-secondary); font-size: 10px;
font-size: 12px;
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
opacity: 0;
} }
.modern-sidebar:hover .collapse-trigger, .sidebar-collapse-trigger:hover {
.collapse-trigger:focus { color: #1677ff;
opacity: 1; border-color: rgba(22, 119, 255, 0.28);
} background: var(--header-bg);
.collapse-trigger:hover {
color: #fff;
background: #1677ff;
border-color: #1677ff;
box-shadow: 0 4px 12px rgba(22, 119, 255, 0.35);
transform: scale(1.1);
} }
/* Menu Area */ /* Menu Area */
@ -228,4 +220,4 @@
.logout-btn:hover { .logout-btn:hover {
background-color: var(--border-color); background-color: var(--border-color);
color: #ef4444; /* Red for logout */ color: #ef4444; /* Red for logout */
} }

View File

@ -1,12 +1,10 @@
import React, { useState } from 'react'; import React from 'react';
import { Layout, Avatar, Tooltip, Button } from 'antd'; import { Layout, Avatar, Tooltip } from 'antd';
import { import {
MenuUnfoldOutlined,
MenuFoldOutlined,
LogoutOutlined, LogoutOutlined,
QuestionCircleOutlined, QuestionCircleOutlined,
RightOutlined, RightOutlined,
LeftOutlined LeftOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
import './ModernSidebar.css'; import './ModernSidebar.css';
@ -81,13 +79,14 @@ const ModernSidebar = ({
<div className="logo-container"> <div className="logo-container">
{logo} {logo}
</div> </div>
{/* 折叠按钮 - 悬浮在边缘 */} <button
<div type="button"
className="collapse-trigger" className="sidebar-collapse-trigger"
onClick={() => onCollapse && onCollapse(!collapsed)} onClick={() => onCollapse && onCollapse(!collapsed)}
aria-label={collapsed ? '展开侧边栏' : '收起侧边栏'}
> >
{collapsed ? <RightOutlined /> : <LeftOutlined />} {collapsed ? <RightOutlined /> : <LeftOutlined />}
</div> </button>
</div> </div>
{/* 菜单列表区域 */} {/* 菜单列表区域 */}