From b5bdb36c7580210ccbac6271a07d16de64c77d41 Mon Sep 17 00:00:00 2001 From: gaoyunqi Date: Fri, 23 Feb 2024 18:11:24 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=EF=BC=8C=E9=9A=90=E8=97=8F=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/logo_geg.png | Bin 0 -> 18946 bytes src/components/Application/src/AppLogo.vue | 164 +++-- .../SimpleMenu/src/components/menu.less | 560 +++++++++--------- src/design/color.less | 18 +- src/layouts/default/header/index.vue | 6 +- src/settings/designSetting.ts | 42 +- src/views/sys/login/SessionTimeoutLogin.vue | 78 ++- 7 files changed, 412 insertions(+), 456 deletions(-) create mode 100644 src/assets/images/logo_geg.png diff --git a/src/assets/images/logo_geg.png b/src/assets/images/logo_geg.png new file mode 100644 index 0000000000000000000000000000000000000000..972499178b05a077d68a91823629dffa623b13c6 GIT binary patch literal 18946 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 literal 0 HcmV?d00001 diff --git a/src/components/Application/src/AppLogo.vue b/src/components/Application/src/AppLogo.vue index a419b88..5fcb269 100644 --- a/src/components/Application/src/AppLogo.vue +++ b/src/components/Application/src/AppLogo.vue @@ -3,100 +3,96 @@ * @Description: logo component --> diff --git a/src/components/SimpleMenu/src/components/menu.less b/src/components/SimpleMenu/src/components/menu.less index 1aff483..5e52214 100644 --- a/src/components/SimpleMenu/src/components/menu.less +++ b/src/components/SimpleMenu/src/components/menu.less @@ -3,312 +3,312 @@ @submenu-popup-prefix-cls: ~'@{namespace}-menu-submenu-popup'; @transition-time: 0.2s; -@menu-dark-subsidiary-color: rgba(255, 255, 255, 0.7); +@menu-dark-subsidiary-color: rgba(255, 255, 255, 0.9); .light-border { - &::after { - position: absolute; - top: 0; - right: 0; - bottom: 0; - display: block; - width: 2px; - content: ''; - background-color: @primary-color; - } + &::after { + position: absolute; + top: 0; + right: 0; + bottom: 0; + display: block; + width: 2px; + content: ''; + background-color: @primary-color; + } } .@{menu-prefix-cls}-menu-popover { - .ant-popover-arrow { - display: none; - } - - .ant-popover-inner-content { - padding: 0; - max-height: 100vh; - overflow: auto; - } - - .@{menu-prefix-cls} { - &-opened > * > &-submenu-title-icon { - transform: translateY(-50%) rotate(90deg) !important; + .ant-popover-arrow { + display: none; } - &-item, - &-submenu-title { - position: relative; - z-index: 1; - padding: 12px 20px; - color: @menu-dark-subsidiary-color; - cursor: pointer; - transition: all @transition-time @ease-in-out; - - &-icon { - position: absolute; - top: 50%; - right: 18px; - transition: transform @transition-time @ease-in-out; - transform: translateY(-50%) rotate(-90deg); - } + .ant-popover-inner-content { + padding: 0; + max-height: 100vh; + overflow: auto; } - &-dark { - .@{menu-prefix-cls}-item, - .@{menu-prefix-cls}-submenu-title { - // color: @menu-dark-subsidiary-color; - background: @sider-dark-lighten-bg-color; - - &:hover { - color: #fff; + .@{menu-prefix-cls} { + &-opened > * > &-submenu-title-icon { + transform: translateY(-50%) rotate(90deg) !important; } - &-selected { - color: #fff; - background-color: @primary-color !important; + &-item, + &-submenu-title { + position: relative; + z-index: 1; + padding: 12px 20px; + color: @menu-dark-subsidiary-color; + cursor: pointer; + transition: all @transition-time @ease-in-out; + + &-icon { + position: absolute; + top: 50%; + right: 18px; + transition: transform @transition-time @ease-in-out; + transform: translateY(-50%) rotate(-90deg); + } + } + + &-dark { + .@{menu-prefix-cls}-item, + .@{menu-prefix-cls}-submenu-title { + // color: @menu-dark-subsidiary-color; + background: @sider-dark-lighten-bg-color; + + &:hover { + color: #fff; + } + + &-selected { + color: #fff; + background-color: @primary-color !important; + } + } + } + + &-light { + .@{menu-prefix-cls}-item, + .@{menu-prefix-cls}-submenu-title { + color: @text-color-base; + + &:hover { + color: @primary-color; + } + + &-selected { + z-index: 2; + color: @primary-color; + background-color: fade(@primary-color, 10); + + .light-border(); + } + } } - } } - - &-light { - .@{menu-prefix-cls}-item, - .@{menu-prefix-cls}-submenu-title { - color: @text-color-base; - - &:hover { - color: @primary-color; - } - - &-selected { - z-index: 2; - color: @primary-color; - background-color: fade(@primary-color, 10); - - .light-border(); - } - } - } - } } .content(); .content() { - .@{menu-prefix-cls} { - position: relative; - display: block; - width: 100%; - padding: 0; - margin: 0; - font-size: @font-size-base; - color: @text-color-base; - list-style: none; - outline: none; - .@{menu-prefix-cls} { - background-color: @sider-dark-lighten-bg-color; - } - // .collapse-transition { - // transition: @transition-time height ease-in-out, @transition-time padding-top ease-in-out, - // @transition-time padding-bottom ease-in-out; - // } - - &-light { - background-color: #fff; - - .@{menu-prefix-cls}-submenu-active { - color: @primary-color !important; - - &-border { - .light-border(); - } - } - } - - &-dark { - .@{menu-prefix-cls}-submenu-active { - color: #fff !important; - } - } - - &-item { - position: relative; - z-index: 1; - display: flex; - align-items: center; - font-size: @font-size-base; - color: inherit; - list-style: none; - cursor: pointer; - outline: none; - - &:hover, - &:active { - color: inherit; - } - } - - &-item > i { - margin-right: 6px; - } - - &-submenu-title > i, - &-submenu-title span > i { - margin-right: 8px; - } - - // vertical - &-vertical &-item, - &-vertical &-submenu-title { - position: relative; - z-index: 1; - padding: 14px 24px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - cursor: pointer; - - &:hover { - color: @primary-color; - } - - .@{menu-prefix-cls}-tooltip { - width: calc(100% - 0px); - padding: 12px 0; - text-align: center; - } - .@{menu-prefix-cls}-submenu-popup { - padding: 12px 0; - } - } - - &-vertical &-submenu-collapse { - .@{submenu-popup-prefix-cls} { - display: flex; - align-items: center; - justify-content: center; - } - .@{menu-prefix-cls}-submenu-collapsed-show-tit { - flex-direction: column; - } - } - - &-vertical&-collapse &-item, - &-vertical&-collapse &-submenu-title { - padding: 0; - } - - &-vertical &-submenu-title-icon { - position: absolute; - top: 50%; - right: 18px; - transform: translateY(-50%); - } - - &-submenu-title-icon { - transition: transform @transition-time @ease-in-out; - } - - &-vertical &-opened > * > &-submenu-title-icon { - transform: translateY(-50%) rotate(180deg); - } - - &-vertical &-submenu { - &-nested { - padding-left: 20px; - } - .@{menu-prefix-cls}-item { - padding-left: 43px; - } - } - - &-light&-vertical &-item { - &-active:not(.@{menu-prefix-cls}-submenu) { - z-index: 2; - color: @primary-color; - background-color: fade(@primary-color, 10); - - .light-border(); - } - &-active.@{menu-prefix-cls}-submenu { - color: @primary-color; - } - } - - &-light&-vertical&-collapse { - > li.@{menu-prefix-cls}-item-active, - .@{menu-prefix-cls}-submenu-active { position: relative; - background-color: fade(@primary-color, 5); + display: block; + width: 100%; + padding: 0; + margin: 0; + font-size: @font-size-base; + color: @text-color-base; + list-style: none; + outline: none; - &::after { - display: none; + .@{menu-prefix-cls} { + background-color: @sider-dark-lighten-bg-color; + } + // .collapse-transition { + // transition: @transition-time height ease-in-out, @transition-time padding-top ease-in-out, + // @transition-time padding-bottom ease-in-out; + // } + + &-light { + background-color: #fff; + + .@{menu-prefix-cls}-submenu-active { + color: @primary-color !important; + + &-border { + .light-border(); + } + } } - &::before { - position: absolute; - top: 0; - left: 0; - width: 3px; - height: 100%; - content: ''; - background-color: @primary-color; - } - } - } - - &-dark&-vertical &-item, - &-dark&-vertical &-submenu-title { - color: @menu-dark-subsidiary-color; - &-active:not(.@{menu-prefix-cls}-submenu) { - color: #fff !important; - background-color: @primary-color !important; - } - - &:hover { - color: #5e95ff; - } - } - - &-dark&-vertical&-collapse { - > li.@{menu-prefix-cls}-item-active, - .@{menu-prefix-cls}-submenu-active { - position: relative; - color: #fff !important; - background-color: @sider-dark-darken-bg-color !important; - - &::before { - position: absolute; - top: 0; - left: 0; - width: 3px; - height: 100%; - content: ''; - background-color: @primary-color; + &-dark { + .@{menu-prefix-cls}-submenu-active { + color: #fff !important; + } } - .@{menu-prefix-cls}-submenu-collapse { - background-color: transparent; + &-item { + position: relative; + z-index: 1; + display: flex; + align-items: center; + font-size: @font-size-base; + color: inherit; + list-style: none; + cursor: pointer; + outline: none; + + &:hover, + &:active { + color: inherit; + } } - } - } - &-dark&-vertical &-submenu &-item { - &-active, - &-active:hover { - color: #fff; - border-right: none; - } - } - - &-dark&-vertical &-child-item-active > &-submenu-title { - color: #fff; - } - - &-dark&-vertical &-opened { - .@{menu-prefix-cls}-submenu-has-parent-submenu { - .@{menu-prefix-cls}-submenu-title { - background-color: transparent; + &-item > i { + margin-right: 6px; + } + + &-submenu-title > i, + &-submenu-title span > i { + margin-right: 8px; + } + + // vertical + &-vertical &-item, + &-vertical &-submenu-title { + position: relative; + z-index: 1; + padding: 14px 24px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + cursor: pointer; + + &:hover { + color: @primary-color; + } + + .@{menu-prefix-cls}-tooltip { + width: calc(100% - 0px); + padding: 12px 0; + text-align: center; + } + .@{menu-prefix-cls}-submenu-popup { + padding: 12px 0; + } + } + + &-vertical &-submenu-collapse { + .@{submenu-popup-prefix-cls} { + display: flex; + align-items: center; + justify-content: center; + } + .@{menu-prefix-cls}-submenu-collapsed-show-tit { + flex-direction: column; + } + } + + &-vertical&-collapse &-item, + &-vertical&-collapse &-submenu-title { + padding: 0; + } + + &-vertical &-submenu-title-icon { + position: absolute; + top: 50%; + right: 18px; + transform: translateY(-50%); + } + + &-submenu-title-icon { + transition: transform @transition-time @ease-in-out; + } + + &-vertical &-opened > * > &-submenu-title-icon { + transform: translateY(-50%) rotate(180deg); + } + + &-vertical &-submenu { + &-nested { + padding-left: 20px; + } + .@{menu-prefix-cls}-item { + padding-left: 43px; + } + } + + &-light&-vertical &-item { + &-active:not(.@{menu-prefix-cls}-submenu) { + z-index: 2; + color: @primary-color; + background-color: fade(@primary-color, 10); + + .light-border(); + } + &-active.@{menu-prefix-cls}-submenu { + color: @primary-color; + } + } + + &-light&-vertical&-collapse { + > li.@{menu-prefix-cls}-item-active, + .@{menu-prefix-cls}-submenu-active { + position: relative; + background-color: fade(@primary-color, 5); + + &::after { + display: none; + } + + &::before { + position: absolute; + top: 0; + left: 0; + width: 3px; + height: 100%; + content: ''; + background-color: @primary-color; + } + } + } + + &-dark&-vertical &-item, + &-dark&-vertical &-submenu-title { + color: @menu-dark-subsidiary-color; + &-active:not(.@{menu-prefix-cls}-submenu) { + color: #fff !important; + background-color: rgb(0 0 0 / 40%) !important; + } + + &:hover { + color: #5e95ff; + } + } + + &-dark&-vertical&-collapse { + > li.@{menu-prefix-cls}-item-active, + .@{menu-prefix-cls}-submenu-active { + position: relative; + color: #fff !important; + background-color: @sider-dark-darken-bg-color !important; + + &::before { + position: absolute; + top: 0; + left: 0; + width: 3px; + height: 100%; + content: ''; + background-color: @primary-color; + } + + .@{menu-prefix-cls}-submenu-collapse { + background-color: transparent; + } + } + } + + &-dark&-vertical &-submenu &-item { + &-active, + &-active:hover { + color: #fff; + border-right: none; + } + } + + &-dark&-vertical &-child-item-active > &-submenu-title { + color: #fff; + } + + &-dark&-vertical &-opened { + .@{menu-prefix-cls}-submenu-has-parent-submenu { + .@{menu-prefix-cls}-submenu-title { + background-color: transparent; + } + } } - } } - } } diff --git a/src/design/color.less b/src/design/color.less index 3c17e26..502a172 100644 --- a/src/design/color.less +++ b/src/design/color.less @@ -1,13 +1,13 @@ html { - // header - --header-bg-color: #394664; - --header-bg-hover-color: #273352; - --header-active-menu-bg-color: #273352; + // header + --header-bg-color: #394664; + --header-bg-hover-color: #273352; + --header-active-menu-bg-color: #273352; - // sider - --sider-dark-bg-color: #030523; - --sider-dark-darken-bg-color: #273352; - --sider-dark-lighten-bg-color: #273352; + // sider + --sider-dark-bg-color: #002f7b; + --sider-dark-darken-bg-color: #273352; + --sider-dark-lighten-bg-color: #273352; } @white: #fff; @@ -65,7 +65,7 @@ html { // let -menu @sider-dark-bg-color: var(--sider-dark-bg-color); -@sider-dark-darken-bg-color: var(--sider-dark-darken-bg-color); +@sider-dark-darken-bg-color: var(--sider-dark-bg-color); @sider-dark-lighten-bg-color: var(--sider-dark-lighten-bg-color); // trigger diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue index 4ea952f..87962be 100644 --- a/src/layouts/default/header/index.vue +++ b/src/layouts/default/header/index.vue @@ -21,12 +21,11 @@
- - +
@@ -52,7 +51,7 @@ import { SettingButtonPositionEnum } from '/@/enums/appEnum'; import { UserPostChange } from '/@/components/Application'; - import { LayoutBreadcrumb, FullScreen, Notify, ErrorAction } from './components'; + import { LayoutBreadcrumb, Notify, ErrorAction } from './components'; import UserDropDown from '/@/layouts/default/header/components/user-dropdown/DropDown.vue'; import { useAppInject } from '/@/hooks/web/useAppInject'; import { useDesign } from '/@/hooks/web/useDesign'; @@ -69,7 +68,6 @@ LayoutBreadcrumb, LayoutMenu, UserDropDown, - FullScreen, Notify, AppSearch, ErrorAction, diff --git a/src/settings/designSetting.ts b/src/settings/designSetting.ts index 28d60ab..07aa06a 100644 --- a/src/settings/designSetting.ts +++ b/src/settings/designSetting.ts @@ -5,46 +5,10 @@ export const prefixCls = 'vben'; export const darkMode = ThemeEnum.LIGHT; // app theme preset color -export const APP_PRESET_COLOR_LIST: string[] = [ - '#5e95ff', - '#0960bd', - '#0084f4', - '#009688', - '#536dfe', - '#ff5c93', - '#ee4f12', - '#0096c7', - '#9c27b0', - '#ff9800', -]; +export const APP_PRESET_COLOR_LIST: string[] = ['#5e95ff', '#0960bd', '#0084f4', '#009688', '#536dfe', '#ff5c93', '#ee4f12', '#0096c7', '#9c27b0', '#ff9800']; // header preset color -export const HEADER_PRESET_BG_COLOR_LIST: string[] = [ - '#07093E', - '#ffffff', - '#151515', - '#009688', - '#5172DC', - '#018ffb', - '#409eff', - '#e74c3c', - '#24292e', - '#394664', - '#001529', - '#383f45', -]; +export const HEADER_PRESET_BG_COLOR_LIST: string[] = ['#07093E', '#ffffff', '#151515', '#009688', '#5172DC', '#018ffb', '#409eff', '#e74c3c', '#24292e', '#394664', '#001529', '#383f45']; // sider preset color -export const SIDE_BAR_BG_COLOR_LIST: string[] = [ - '#07093E', - '#212121', - '#273352', - '#ffffff', - '#191b24', - '#191a23', - '#304156', - '#001628', - '#28333E', - '#344058', - '#383f45', -]; +export const SIDE_BAR_BG_COLOR_LIST: string[] = ['#002F7B', '#212121', '#273352', '#ffffff', '#191b24', '#191a23', '#304156', '#001628', '#28333E', '#344058', '#383f45']; diff --git a/src/views/sys/login/SessionTimeoutLogin.vue b/src/views/sys/login/SessionTimeoutLogin.vue index d1a2f34..e112166 100644 --- a/src/views/sys/login/SessionTimeoutLogin.vue +++ b/src/views/sys/login/SessionTimeoutLogin.vue @@ -1,53 +1,51 @@