diff --git a/src/assets/images/logo_geg.png b/src/assets/images/logo_geg.png new file mode 100644 index 0000000..9724991 Binary files /dev/null and b/src/assets/images/logo_geg.png differ 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 @@