Skip to content

Commit

Permalink
Revert "动态改变颜色"
Browse files Browse the repository at this point in the history
This reverts commit 91c29da.
  • Loading branch information
FairyEver committed Jun 7, 2019
1 parent 91c29da commit 179b298
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 122 deletions.
1 change: 0 additions & 1 deletion .env
Expand Up @@ -3,4 +3,3 @@ VUE_APP_API=/api/
VUE_APP_REPO=https://github.com/d2-projects/d2-admin
VUE_APP_I18N_LOCALE=zh-chs
VUE_APP_I18N_FALLBACK_LOCALE=en
VUE_APP_ELEMENT_COLOR=#409EFF
5 changes: 2 additions & 3 deletions package.json
Expand Up @@ -25,7 +25,7 @@
"countup.js": "^2.0.4",
"dayjs": "^1.8.12",
"echarts": "^4.2.1",
"element-ui": "^2.9.1",
"element-ui": "^2.7.2",
"flex.css": "^1.1.7",
"fuse.js": "^3.4.4",
"github-markdown-css": "^3.0.1",
Expand Down Expand Up @@ -72,7 +72,6 @@
"text-loader": "0.0.1",
"uglifyjs-webpack-plugin": "^2.1.2",
"vue-cli-plugin-i18n": "^0.6.0",
"vue-template-compiler": "^2.5.21",
"webpack-theme-color-replacer": "^1.2.1"
"vue-template-compiler": "^2.5.21"
}
}
41 changes: 0 additions & 41 deletions src/layout/header-aside/components/header-color/index.vue

This file was deleted.

5 changes: 1 addition & 4 deletions src/layout/header-aside/layout.vue
Expand Up @@ -32,7 +32,6 @@
<d2-header-theme/>
<d2-header-size/>
<d2-header-locales/>
<d2-header-color></d2-header-color>
<d2-header-user/>
</div>
</div>
Expand Down Expand Up @@ -93,7 +92,6 @@ import d2HeaderSize from './components/header-size'
import d2HeaderTheme from './components/header-theme'
import d2HeaderUser from './components/header-user'
import d2HeaderLog from './components/header-log'
import d2HeaderColor from './components/header-color'
import { mapState, mapGetters, mapActions } from 'vuex'
import mixinSearch from './mixins/search'
export default {
Expand All @@ -111,8 +109,7 @@ export default {
d2HeaderSize,
d2HeaderTheme,
d2HeaderUser,
d2HeaderLog,
d2HeaderColor
d2HeaderLog
},
data () {
return {
Expand Down
1 change: 0 additions & 1 deletion src/store/modules/d2admin/modules/account.js
Expand Up @@ -107,7 +107,6 @@ export default {
await dispatch('d2admin/menu/asideCollapseLoad', null, { root: true })
// DB -> store 持久化数据加载全局尺寸
await dispatch('d2admin/size/load', null, { root: true })
await dispatch('d2admin/color/load', null, { root: true })
// end
resolve()
})
Expand Down
46 changes: 0 additions & 46 deletions src/store/modules/d2admin/modules/color.js

This file was deleted.

6 changes: 3 additions & 3 deletions src/views/system/login/page.vue
Expand Up @@ -91,9 +91,9 @@
</a>
</p>
<p class="page-login--content-footer-copyright">
{{ $t('views.system.login.footer.copyright.copyright') }}
<d2-icon name="copyright"/>
{{ $t('views.system.login.footer.copyright.content') }}
{{ $t('views.system.login.footer.copyright.copyright') }}
<d2-icon name="copyright"/>
{{ $t('views.system.login.footer.copyright.content') }}
<a href="https://github.com/FairyEver">
@{{ $t('views.system.login.footer.copyright.author') }}
</a>
Expand Down
14 changes: 0 additions & 14 deletions vue.config.js
@@ -1,9 +1,6 @@
const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
const VueFilenameInjector = require('./tools/vue-filename-injector')

const ThemeColorReplacer = require('webpack-theme-color-replacer')
const forElementUI = require('webpack-theme-color-replacer/forElementUI')

// 拼接路径
const resolve = dir => require('path').join(__dirname, dir)

Expand All @@ -29,17 +26,6 @@ module.exports = {
}
}
},
configureWebpack: {
plugins: [
new ThemeColorReplacer({
fileName: 'css/theme-colors.[contenthash:8].css',
matchColors: [
...forElementUI.getElementUISeries(process.env.VUE_APP_ELEMENT_COLOR) // Element-ui主色系列
],
changeSelector: forElementUI.changeSelector
})
]
},
// 默认设置: https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-service/lib/config/base.js
chainWebpack: config => {
/**
Expand Down
12 changes: 3 additions & 9 deletions yarn.lock
Expand Up @@ -3101,10 +3101,9 @@ element-resize-detector@^1.1.10:
dependencies:
batch-processor "^1.0.0"

element-ui@^2.9.1:
version "2.9.1"
resolved "https://registry.npm.taobao.org/element-ui/download/element-ui-2.9.1.tgz#a05f2e76023d529ba0dfa2d03ae16e5134b20c4e"
integrity sha1-oF8udgI9Upug36LQOuFuUTSyDE4=
element-ui@^2.7.2:
version "2.8.2"
resolved "https://registry.npmjs.org/element-ui/-/element-ui-2.8.2.tgz#21a7a4cb92616b0f8b75d4d4e637d3a1cd8c09de"
dependencies:
async-validator "~1.8.1"
babel-helper-vue-jsx-merge-props "^2.0.0"
Expand Down Expand Up @@ -9098,11 +9097,6 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0:
source-list-map "^2.0.0"
source-map "~0.6.1"

webpack-theme-color-replacer@^1.2.1:
version "1.2.1"
resolved "https://registry.npm.taobao.org/webpack-theme-color-replacer/download/webpack-theme-color-replacer-1.2.1.tgz#6ab2ba55095b55ae41aebb06378238b712636623"
integrity sha1-arK6VQlbVa5BrrsGN4I4txJjZiM=

"webpack@>=4 < 4.29":
version "4.28.4"
resolved "https://registry.npmjs.org/webpack/-/webpack-4.28.4.tgz#1ddae6c89887d7efb752adf0c3cd32b9b07eacd0"
Expand Down

0 comments on commit 179b298

Please sign in to comment.