diff --git a/src/components/main/components/fullscreen/fullscreen.vue b/src/components/main/components/fullscreen/fullscreen.vue deleted file mode 100644 index d5213fa..0000000 --- a/src/components/main/components/fullscreen/fullscreen.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - diff --git a/src/components/main/components/fullscreen/index.js b/src/components/main/components/fullscreen/index.js deleted file mode 100644 index 422c7c1..0000000 --- a/src/components/main/components/fullscreen/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Fullscreen from './fullscreen.vue' -export default Fullscreen diff --git a/src/components/main/components/user/user.less b/src/components/main/components/user/user.less index f8366e1..efbdff9 100644 --- a/src/components/main/components/user/user.less +++ b/src/components/main/components/user/user.less @@ -3,34 +3,31 @@ cursor: pointer; display: inline-block; vertical-align: middle; - padding: 4px 8px; - border-radius: 18px; + padding: 4px 10px; + border-radius: 20px; transition: background .18s; &:hover{ background: rgba(79, 110, 247, .08); } - // 头像:小尺寸、无描边无光晕,安静融入顶栏 + // 头像:白色描边 + 主色光晕,悬浮轻微放大 .user-avatar{ - width: 28px; - height: 28px; - font-size: 13px; + width: 34px; + height: 34px; + font-size: 16px; vertical-align: middle; + box-shadow: 0 0 0 2px #fff, 0 2px 6px rgba(79, 110, 247, .25); + transition: transform .15s; } - // 姓名与下拉箭头:常规字重、浅色,视觉减重 + &:hover .user-avatar{ + transform: scale(1.06); + } + // 姓名:常规字重,与头像平衡 .user-nick{ font-size: 14px; - font-weight: 400; - color: #515a6e; - margin: 0 2px 0 8px; + font-weight: 500; + color: #3d4a66; + margin-left: 8px; vertical-align: middle; } - .user-arrow{ - vertical-align: middle; - color: #a3b0c9; - transition: transform .18s; - } - &:hover .user-arrow{ - transform: rotate(180deg); - } } } diff --git a/src/components/main/components/user/user.vue b/src/components/main/components/user/user.vue index d60b2cc..20b8486 100644 --- a/src/components/main/components/user/user.vue +++ b/src/components/main/components/user/user.vue @@ -3,7 +3,6 @@ {{ avatarText }} {{ nickname }} - 个人中心 退出登录 diff --git a/src/components/main/main.less b/src/components/main/main.less index ac9ea4c..2f9f986 100644 --- a/src/components/main/main.less +++ b/src/components/main/main.less @@ -58,7 +58,8 @@ .left-sider{ // 浅灰蓝侧边栏:比内容区深半档,形成层次但不沉重 background: #f0f3fa; - box-shadow: 1px 0 0 #e2e8f5; + // 分隔线用 border 而非 box-shadow:阴影会被右侧内容区(标签栏等)背景盖住 + border-right: 1px solid #e2e8f5; .ivu-layout-sider-children{ overflow-y: scroll; margin-right: -18px; diff --git a/src/components/main/main.vue b/src/components/main/main.vue index 5f287b2..bc02040 100644 --- a/src/components/main/main.vue +++ b/src/components/main/main.vue @@ -14,7 +14,6 @@ - @@ -37,7 +36,6 @@ import SideMenu from './components/side-menu' import HeaderBar from './components/header-bar' import TagsNav from './components/tags-nav' import User from './components/user' -import Fullscreen from './components/fullscreen' import ErrorStore from './components/error-store' import { mapMutations, mapActions, mapGetters } from 'vuex' import { getNewTagList, getNextRoute, routeEqual } from '@/libs/util' @@ -48,14 +46,12 @@ export default { SideMenu, HeaderBar, TagsNav, - Fullscreen, ErrorStore, User }, data () { return { - collapsed: false, - isFullscreen: false + collapsed: false } }, computed: {