diff --git a/assets/scss/common.scss b/assets/scss/common.scss index d9d9ee8..45df3e4 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -1,17 +1,5 @@ // router-tab (header) -@import "./var.scss"; @import "./mixin.scss"; -@import "./common/fonts.scss"; -@import "./common/text.scss"; -@import "./common/input.scss"; -@import "./common/button.scss"; -@import "./common/grid.scss"; -@import "./common/card.scss"; -@import "./common/tabs.scss"; -@import "./common/numericInput.scss"; -@import "./common/pagination.scss"; -@import "./common/editor.scss"; - html, body { @@ -335,74 +323,6 @@ a { } } - .router-tab { - .router-tab__header { - background-color: map-deep-get($config, #{$theme}, "router-header"); - border-color: map-deep-get($config, #{$theme}, "router-header"); - height: 46px; - z-index: 7; - max-width: calc(100vw - 290px); - } - - .router-tab__container { - background-color: map-deep-get($config, #{$theme}, "router-container"); - } - - .router-tab__item { - background-color: map-deep-get($config, #{$theme}, "router-tab-item"); - border-color: map-deep-get($config, #{$theme}, "router-tab-item"); - color: map-deep-get($config, #{$theme}, "router-tab-item-color"); - - &:not(.is-active) { - &:hover { - &>span { - color: map-deep-get($config, - #{$theme}, - "router-tab-item-hover-color" - ); - } - } - } - - .v-icon { - color: map-deep-get($config, #{$theme}, "router-tab-item-icon-color"); - } - - &.is-active { - background-color: map-deep-get($config, - #{$theme}, - "router-tab-item-active" - ); - border-color: map-deep-get($config, - #{$theme}, - "router-tab-item-active-color" - ) !important; - color: map-deep-get($config, - #{$theme}, - "router-tab-item-active-color" - ); - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "router-tab-item-icon-active-color" - ); - } - - } - } - - .router-tab__slot-end { - .v-btn { - background-color: map-deep-get($config, - #{$theme}, - "router-tab-slot-end-button-backgroundColor" - ); - box-shadow: none; - } - } - } - .border-bottom-1 { border-bottom: 1px solid map-deep-get($config, #{$theme}, "border-color"); } diff --git a/assets/scss/layout.scss b/assets/scss/layout.scss index d5dc948..c93766d 100644 --- a/assets/scss/layout.scss +++ b/assets/scss/layout.scss @@ -182,6 +182,7 @@ height: calc(100vh - 110px); max-height: calc(100vh - 115px); padding: 20px; + background-color: transparent !important; } .router-tab__slot-end { @@ -436,6 +437,70 @@ } } + .router-tab { + .router-tab__header { + background-color: map-deep-get($config, #{$theme}, "router-header"); + border-color: map-deep-get($config, #{$theme}, "router-header"); + height: 46px; + z-index: 7; + max-width: calc(100vw - 290px); + } + + .router-tab__item { + background-color: map-deep-get($config, #{$theme}, "router-tab-item"); + border-color: map-deep-get($config, #{$theme}, "router-tab-item"); + color: map-deep-get($config, #{$theme}, "router-tab-item-color"); + + &:not(.is-active) { + &:hover { + &>span { + color: map-deep-get($config, + #{$theme}, + "router-tab-item-hover-color" + ); + } + } + } + + .v-icon { + color: map-deep-get($config, #{$theme}, "router-tab-item-icon-color"); + } + + &.is-active { + background-color: map-deep-get($config, + #{$theme}, + "router-tab-item-active" + ); + border-color: map-deep-get($config, + #{$theme}, + "router-tab-item-active-color" + ) !important; + color: map-deep-get($config, + #{$theme}, + "router-tab-item-active-color" + ); + + .v-icon { + color: map-deep-get($config, + #{$theme}, + "router-tab-item-icon-active-color" + ); + } + + } + } + + .router-tab__slot-end { + .v-btn { + background-color: map-deep-get($config, + #{$theme}, + "router-tab-slot-end-button-backgroundColor" + ); + box-shadow: none; + } + } + } + } } } diff --git a/assets/scss/theme.scss b/assets/scss/theme.scss index 51fcc95..062990b 100644 --- a/assets/scss/theme.scss +++ b/assets/scss/theme.scss @@ -1,10 +1,3 @@ -// @import './var.scss'; -// @import './functions.scss'; -// @import './mixin.scss'; - - - - // @each $theme in dark, light{ // @include theme($theme); // .v-application.#{$theme}-mode{ diff --git a/components/common/AdminMenu.vue b/components/common/AdminMenu.vue index e6691ec..96b3806 100644 --- a/components/common/AdminMenu.vue +++ b/components/common/AdminMenu.vue @@ -112,7 +112,6 @@ export default { }; diff --git a/nuxt.config.js b/nuxt.config.js index a878b91..beed21e 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -58,9 +58,9 @@ module.exports = { // Modules: https://go.nuxtjs.dev/config-modules modules: ['@nuxtjs/axios', '@nuxtjs/dayjs', '@nuxtjs/style-resources' ], - styleResources: { - scss: ['./assets/scss/*.scss'], - }, + // styleResources: { + // scss: ['./assets/scss/*.scss'], + // }, proxy: { "/api/": { target: "http://0.0.0.0:9999/", diff --git a/pages/ems/base/AddInfoMngPage.vue b/pages/ems/base/AddInfoMngPage.vue index 55d8139..bbed97a 100644 --- a/pages/ems/base/AddInfoMngPage.vue +++ b/pages/ems/base/AddInfoMngPage.vue @@ -626,6 +626,3 @@ const myDetail = [ }, ]; - diff --git a/pages/ems/base/ReadObjectMngPage.vue b/pages/ems/base/ReadObjectMngPage.vue index 4f8a11c..1bf102c 100644 --- a/pages/ems/base/ReadObjectMngPage.vue +++ b/pages/ems/base/ReadObjectMngPage.vue @@ -855,7 +855,6 @@ const myDetail = [ ]; diff --git a/pages/ems/effc/EnrgUsePlanPage.vue b/pages/ems/effc/EnrgUsePlanPage.vue index e86ff17..71b48f6 100644 --- a/pages/ems/effc/EnrgUsePlanPage.vue +++ b/pages/ems/effc/EnrgUsePlanPage.vue @@ -819,8 +819,6 @@ const defaultData = { };