diff --git a/src/components/LxHeader/index.vue b/src/components/LxHeader/index.vue index 8c95167..fbc051d 100644 --- a/src/components/LxHeader/index.vue +++ b/src/components/LxHeader/index.vue @@ -42,9 +42,9 @@ export default { // padding-top: 10px; font-weight: bold; font-size: 15px; - color: #0077CC; + color: #b3241d; white-space: nowrap; - border-bottom: 2px solid #0077CC; + border-bottom: 2px solid #b3241d; > span { position: relative; @@ -53,7 +53,7 @@ export default { .content { line-height: 25px; padding-left: 10px; - padding: 6px 0 0 10px; + padding: 6px 0 0 0px; } .v-right-content { flex: 1; diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index 5ecf7f7..b5c5de4 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -98,7 +98,7 @@ } \ No newline at end of file + } */ + diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index 1f62d31..f177e09 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -1,7 +1,9 @@ /* 改变主题色变量 */ -$--color-primary: #0077CC; +// $--color-primary: #0077CC; +$--color-primary: #b3241d; + /* 改变 icon 字体路径变量,必需 */ $--font-path: '~element-ui/lib/theme-chalk/fonts'; -@import "~element-ui/packages/theme-chalk/src/index"; \ No newline at end of file +@import "~element-ui/packages/theme-chalk/src/index"; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 0968334..3a6df9f 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -10,8 +10,8 @@ .sidebar-container { transition: width 0.28s; width: $sideBarWidth !important; - //background-color: $menuBg; - background: linear-gradient(180deg, #0284cd, #0077CC); + background-color: $menuBg; + // background: linear-gradient(180deg, #0284cd, #0077CC); box-shadow: 1px 1px 15px 0px rgba(17, 76, 157, 0.2); height: 100%; position: fixed; @@ -89,7 +89,7 @@ //border-right: 5px solid $subMenuActiveText !important; } .is-active>.el-submenu__title { - color: $subMenuActiveText !important; + color: $subMenuActiveText; } diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 03544c7..dbb36e3 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,19 +1,19 @@ // sidebar -$menuText:#ffffff; +$menuText:#606266; $menuActiveText:#ffffff; $subMenuActiveText:#ffffff; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:rgb(255, 255, 255,0);//#304156 -$menuHover:rgba(242, 242, 242, .4); -$menuActiveBg:rgba(242, 242, 242, .4); +$menuBg:#ffffff;//#304156 +$menuHover:#d96d68; +$menuActiveBg:#b3241d; -$subMenuBg:rgb(255, 255, 255,0);//#304156 -$subMenuHover:rgba(242, 242, 242, .4); -$submenuActiveBg:rgba(242, 242, 242, .4); +$subMenuBg:#ffffff;//#1f2d3d +$subMenuHover:#d96d68; +$submenuActiveBg: #b3241d; $sideBarWidth: 210px; -$primaryColor: #0077CC; +$primaryColor: #b3241d; // the :export directive is the magic sauce for webpack // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass :export { diff --git a/src/styles/viewui-mine.less b/src/styles/viewui-mine.less index 9d4c218..a29d400 100644 --- a/src/styles/viewui-mine.less +++ b/src/styles/viewui-mine.less @@ -1,4 +1,6 @@ @import '~view-design/src/styles/index.less'; // Here are the variables to cover, such as: -@primary-color: #0077CC; +// @primary-color: #0077CC; +@primary-color: #b3241d; + diff --git a/src/views/system/form.vue b/src/views/system/form.vue index 6d4ad44..66fbc48 100644 --- a/src/views/system/form.vue +++ b/src/views/system/form.vue @@ -193,7 +193,7 @@ export default { } &:focus { outline: none; - border-color: #0077cc; + border-color: #b3241d; } } diff --git a/vue.config.js b/vue.config.js index 5201527..c82404e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -25,7 +25,7 @@ module.exports = { * Detail: https://cli.vuejs.org/config/#publicpath */ publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin', - outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin', + outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin_test', assetsDir: 'static', css: { loaderOptions: { // 向 CSS 相关的 loader 传递选项