diff --git a/.gitignore b/.gitignore index 2dfe559..0f49a65 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ public/video /src/layouts/components/zx-layouts /zx-templates /package-lock.json +/src/styles/themes/green.scss +/src/styles/themes/dark.scss +/src/styles/themes/glory.scss diff --git a/src/layouts/export.js b/src/layouts/export.js index 819f448..7172641 100644 --- a/src/layouts/export.js +++ b/src/layouts/export.js @@ -1,6 +1,6 @@ /** * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 公共布局自动导出 + * @description 公共布局及样式自动引入 */ import Vue from 'vue' @@ -18,3 +18,9 @@ requireZxLayouts.keys().forEach((fileName) => { const componentName = componentConfig.default.name Vue.component(componentName, componentConfig.default || componentConfig) }) + +const requireThemes = require.context('@/styles/themes', true, /\.scss$/) +requireThemes.keys().forEach((fileName) => { + console.log(fileName) + require(`@/styles/themes/${fileName.slice(2)}`) +}) diff --git a/src/styles/themes/dark.scss b/src/styles/themes/dark.scss deleted file mode 100644 index 47de1a4..0000000 --- a/src/styles/themes/dark.scss +++ /dev/null @@ -1,124 +0,0 @@ -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 暗黑之子主题(VIP群专享) - */ -@charset "utf-8"; - -.vue-admin-beautiful-theme-dark { - $base-menu-background: #2e2f34; - $base-menu-background-active: #000; - $base-color-blue: #000; - - color: #fff !important; - background-color: #2e2f34 !important; - - *:not(a):not([class*='svg']):not(.el-drawer__wrapper):not(.el-drawer__container) { - color: #fff !important; - background-color: #2e2f34 !important; - border-color: #999 !important; - box-shadow: none !important; - } - - .is-active:not(li) { - *:not(a):not([class*='svg']) { - color: #fff !important; - background-color: #000 !important; - border-color: #999 !important; - } - } - - .svg-external-icon { - color: #fff !important; - } - - .el-scrollbar__bar { - display: none; - } - - @mixin container { - background: $base-menu-background !important; - } - - @mixin active { - &:hover { - background-color: $base-menu-background-active !important; - } - - &.is-active { - background-color: $base-menu-background-active !important; - } - } - - .logo-container-horizontal { - @include container; - } - - .logo-container-vertical { - @include container; - } - - .el-menu { - @include container; - - .el-submenu__title { - @include container; - } - - .el-menu-item { - @include container; - } - } - - .side-bar-container { - @include container; - - .el-menu-item { - @include active; - } - } - - .top-bar-container { - @include container; - - .vab-main { - @include container; - - .el-menu { - &--horizontal { - .el-submenu, - .el-menu-item { - &.is-active { - background-color: $base-menu-background-active !important; - } - } - - > .el-menu-item { - &.is-active { - border-bottom: 3px solid $base-menu-background-active !important; - } - } - } - } - } - } - - .tabs-bar-container { - background: $base-color-white; - border-top: 1px solid #f6f6f6; - - .tabs-content { - .el-tabs__header { - .el-tabs__item { - &.is-active { - background: $base-color-blue !important; - border: 1px solid $base-color-blue !important; - } - } - } - } - } - - .theme-bar-setting { - background: $base-color-blue !important; - } -} diff --git a/src/styles/themes/default.scss b/src/styles/themes/default.scss new file mode 100644 index 0000000..7061af3 --- /dev/null +++ b/src/styles/themes/default.scss @@ -0,0 +1 @@ +/* 绿荫草场主题、荣耀典藏主题、暗黑之子主题加QQ讨论群972435319、1139183756后私聊群主获取,获取后将主题放到themes文件夹根目录即可 */ diff --git a/src/styles/themes/glory.scss b/src/styles/themes/glory.scss deleted file mode 100644 index e431e01..0000000 --- a/src/styles/themes/glory.scss +++ /dev/null @@ -1,99 +0,0 @@ -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 荣耀典藏主题(VIP群专享) - */ -@charset "utf-8"; - -body.vue-admin-beautiful-theme-glory { - $base-menu-background: #2e2f34; - $base-menu-background-active: #f6ca9d; - $base-color-blue: #f6ca9d; - - @mixin container { - background: $base-menu-background !important; - } - - @mixin active { - &:hover { - background-color: $base-menu-background-active !important; - } - - &.is-active { - background-color: $base-menu-background-active !important; - } - } - - .logo-container-horizontal { - @include container; - } - - .logo-container-vertical { - @include container; - } - - .el-menu { - @include container; - - .el-submenu__title { - @include container; - } - - .el-menu-item { - @include container; - } - } - - .side-bar-container { - @include container; - - .el-menu-item { - @include active; - } - } - - .top-bar-container { - @include container; - - .vab-main { - @include container; - - .el-menu { - &--horizontal { - .el-submenu, - .el-menu-item { - &.is-active { - background-color: $base-menu-background-active !important; - } - } - - > .el-menu-item { - &.is-active { - border-bottom: 3px solid $base-menu-background-active !important; - } - } - } - } - } - } - - .tabs-bar-container { - background: $base-color-white; - border-top: 1px solid #f6f6f6; - - .tabs-content { - .el-tabs__header { - .el-tabs__item { - &.is-active { - color: $base-color-white !important; - background: $base-color-blue !important; - border: 1px solid $base-color-blue !important; - } - } - } - } - } - - .theme-bar-setting { - background: $base-color-blue !important; - } -} diff --git a/src/styles/themes/green.scss b/src/styles/themes/green.scss deleted file mode 100644 index f65ab35..0000000 --- a/src/styles/themes/green.scss +++ /dev/null @@ -1,171 +0,0 @@ -/** - * @description 绿荫操场主题 - */ -@charset "utf-8"; - -body.vue-admin-beautiful-theme-green { - $base-menu-background: #16181d; - $base-menu-background-active: #009688; - $base-color-blue: #009688; - - @mixin container { - background: $base-menu-background !important; - } - /** - * 已经覆盖的组件 - * 导航栏,按钮,开关,文字按钮,输入框,下拉选择,下拉菜单,标签,加载层,文件上传 - * 分页,多选框,单选按钮,标签页,时间或日期选择,文本域 - */ - //---------el覆盖 START----------- - @mixin el_border { - border-color: $base-color-blue !important; - } - @mixin el_background { - background: $base-color-blue !important; - } - @mixin el_container { - @include el_background; - @include el_border; - } - - @mixin el_box_show { - box-shadow: -1px 0 0 0 $base-color-blue !important; - } - .el-button--primary, - .el-switch.is-checked .el-switch__core, - .el-checkbox__input.is-checked .el-checkbox__inner, - .el-pagination.is-background .el-pager li:not(.disabled).active, - .el-radio__input.is-checked .el-radio__inner, - .el-checkbox__input.is-indeterminate .el-checkbox__inner { - @include el_container; - } - .el-button--text, - .el-checkbox__input.is-checked + .el-checkbox__label, - .el-loading-spinner .el-loading-text, - .el-loading-spinner i, - .el-radio__input.is-checked + .el-radio__label, - .el-cascader-node.in-active-path, - .el-cascader-node.is-selectable.in-checked-path, - .el-cascader-node.is-active, - .el-dropdown-menu__item:focus, - .el-dropdown-menu__item:not(.is-disabled):hover, - .el-tabs__item.is-active, - .el-upload--picture-card:hover, - .el-tabs__item:hover, - .el-upload:focus, - .el-radio-button__orig-radio:not(:checked) + .el-radio-button__inner:hover, - .el-button--default:not(.el-button--primary):active, - .el-button--default:not(.el-button--primary):hover, - .el-button--default:not(.el-button--primary):focus, - .el-tag:not(.el-tag--danger):not(.el-tag--success):not(.el-tag--info):not(.el-tag--warning) { - color: $base-color-blue; - } - .el-checkbox__inner:hover, - .el-select .el-input.is-focus .el-input__inner, - .el-input__inner:focus, - .el-range-editor.is-active:hover, - .el-range-editor.is-activ, - .el-upload--picture-card:hover, - .el-upload:focus, - .el-textarea__inner:focus, - .el-button--default:not(.el-button--primary):active, - .el-button--default:not(.el-button--primary):hover, - .el-button--default:not(.el-button--primary):focus, - .el-range-editor.is-active { - @include el_border; - } - .el-tabs__active-bar { - @include el_background; - } - - .el-radio-button__orig-radio:checked + .el-radio-button__inner { - @include el_container; - @include el_box_show; - } - //---------el覆盖 END----------- - - @mixin active { - &:hover { - background-color: $base-menu-background-active !important; - } - - &.is-active { - background-color: $base-menu-background-active !important; - } - } - - .logo-container-horizontal { - @include container; - } - - .logo-container-vertical { - @include container; - } - - .el-menu { - @include container; - - .el-submenu__title { - @include container; - } - - .el-menu-item { - @include container; - } - } - - .side-bar-container, - .Fold { - @include container; - - .el-menu-item { - @include active; - } - } - - .top-bar-container { - @include container; - - .vab-main { - @include container; - - .el-menu { - &--horizontal { - .el-submenu, - .el-menu-item { - &.is-active { - background-color: $base-menu-background-active !important; - } - } - - > .el-menu-item { - &.is-active { - border-bottom: 3px solid $base-menu-background-active !important; - } - } - } - } - } - } - - .tabs-bar-container { - background: $base-color-white; - border-top: 1px solid #f6f6f6; - - .tabs-content { - .el-tabs__header { - .el-tabs__item { - &.is-active { - color: $base-color-blue !important; - background: $base-color-white !important; - border: 1px solid $base-color-blue !important; - } - } - } - } - } - - .theme-bar-setting { - background: $base-color-blue !important; - } -} diff --git a/src/styles/vab.scss b/src/styles/vab.scss index 6e575ab..afce8f5 100644 --- a/src/styles/vab.scss +++ b/src/styles/vab.scss @@ -8,9 +8,6 @@ @import './normalize.scss'; @import './transition.scss'; @import './loading.scss'; -@import './themes/green.scss'; -@import './themes/glory.scss'; -@import './themes/dark.scss'; $base: '.vab'; @mixin scrollbar {