From a8d61ef3be22746d37a46ec8d543ce45d0c6b9b1 Mon Sep 17 00:00:00 2001 From: Machengtianjiang Date: Fri, 18 Dec 2020 14:03:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/public/index.html | 4 +- .../src/assets/styles/element-variables.scss | 2 +- ruoyi-ui/src/assets/styles/variables.scss | 4 +- ruoyi-ui/src/components/Header.vue | 121 ------------------ ruoyi-ui/src/layout/index.vue | 2 - 5 files changed, 5 insertions(+), 128 deletions(-) delete mode 100644 ruoyi-ui/src/components/Header.vue diff --git a/ruoyi-ui/public/index.html b/ruoyi-ui/public/index.html index 6d64bf957..9b31cb201 100644 --- a/ruoyi-ui/public/index.html +++ b/ruoyi-ui/public/index.html @@ -1,9 +1,9 @@ - + - + <%= webpackConfig.name %> diff --git a/ruoyi-ui/src/assets/styles/element-variables.scss b/ruoyi-ui/src/assets/styles/element-variables.scss index 8b7a48e9e..f6c559179 100644 --- a/ruoyi-ui/src/assets/styles/element-variables.scss +++ b/ruoyi-ui/src/assets/styles/element-variables.scss @@ -4,7 +4,7 @@ **/ /* theme color */ -$--color-primary: #1890ff; +$--color-primary: #ff4949; $--color-success: #13ce66; $--color-warning: #ffba00; $--color-danger: #ff4949; diff --git a/ruoyi-ui/src/assets/styles/variables.scss b/ruoyi-ui/src/assets/styles/variables.scss index 5bbfbc0fd..68d5e4765 100644 --- a/ruoyi-ui/src/assets/styles/variables.scss +++ b/ruoyi-ui/src/assets/styles/variables.scss @@ -13,7 +13,7 @@ $menuText:#ffffff; $menuActiveText:#ffffff; $subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951 -$menuBg:#4444BB; +$menuBg:#6666BB; $menuHover:#ffffff; $sidebarTitle: #ffffff; @@ -21,7 +21,7 @@ $menuLightBg:#ffffff; $menuLightHover:#ffffff; $sidebarLightTitle: #001529; -$subMenuBg:#5050C0; +$subMenuBg:#8080E0; $subMenuHover:#ffffff; $sideBarWidth: 200px; diff --git a/ruoyi-ui/src/components/Header.vue b/ruoyi-ui/src/components/Header.vue deleted file mode 100644 index 59fd632bf..000000000 --- a/ruoyi-ui/src/components/Header.vue +++ /dev/null @@ -1,121 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue index 51d18247b..a646a69d9 100644 --- a/ruoyi-ui/src/layout/index.vue +++ b/ruoyi-ui/src/layout/index.vue @@ -28,13 +28,11 @@ import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components' import ResizeMixin from './mixin/ResizeHandler' import { mapState } from 'vuex' import variables from '@/assets/styles/variables.scss' -import Header from "@/components/Header"; export default { name: 'Layout', components: { - Header, AppMain, Navbar, RightPanel,