Skip to content

Commit 3466b9f

Browse files
committed
fix postcss bug
1 parent 00e06fe commit 3466b9f

File tree

5 files changed

+66
-56
lines changed

5 files changed

+66
-56
lines changed

.postcssrc.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// https://github.com/michael-ciniawsky/postcss-load-config
2+
3+
module.exports = {
4+
"plugins": {
5+
// to edit target browsers: use "browserlist" field in package.json
6+
"autoprefixer": {}
7+
}
8+
}

build/utils.js

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -3,69 +3,69 @@ var config = require('../config')
33
var ExtractTextPlugin = require('extract-text-webpack-plugin')
44

55
exports.assetsPath = function (_path) {
6-
var assetsSubDirectory = process.env.NODE_ENV === 'production'
7-
? config.build.assetsSubDirectory
8-
: config.dev.assetsSubDirectory
9-
return path.posix.join(assetsSubDirectory, _path)
6+
var assetsSubDirectory = process.env.NODE_ENV === 'production'
7+
? config.build.assetsSubDirectory
8+
: config.dev.assetsSubDirectory
9+
return path.posix.join(assetsSubDirectory, _path)
1010
}
1111

1212
exports.cssLoaders = function (options) {
13-
options = options || {}
13+
options = options || {}
1414

15-
var cssLoader = {
16-
loader: 'css-loader',
17-
options: {
18-
minimize: process.env.NODE_ENV === 'production',
19-
sourceMap: options.sourceMap
20-
}
15+
var cssLoader = {
16+
loader: 'css-loader',
17+
options: {
18+
minimize: process.env.NODE_ENV === 'production',
19+
sourceMap: options.sourceMap
2120
}
21+
}
2222

23-
// generate loader string to be used with extract text plugin
24-
function generateLoaders(loader, loaderOptions) {
25-
var loaders = [cssLoader]
26-
if (loader) {
27-
loaders.push({
28-
loader: loader + '-loader',
29-
options: Object.assign({}, loaderOptions, {
30-
sourceMap: options.sourceMap
31-
})
32-
})
33-
}
34-
35-
// Extract CSS when that option is specified
36-
// (which is the case during production build)
37-
if (options.extract) {
38-
return ExtractTextPlugin.extract({
39-
use: loaders,
40-
fallback: 'vue-style-loader'
41-
})
42-
} else {
43-
return ['vue-style-loader'].concat(loaders)
44-
}
23+
// generate loader string to be used with extract text plugin
24+
function generateLoaders (loader, loaderOptions) {
25+
var loaders = [cssLoader]
26+
if (loader) {
27+
loaders.push({
28+
loader: loader + '-loader',
29+
options: Object.assign({}, loaderOptions, {
30+
sourceMap: options.sourceMap
31+
})
32+
})
4533
}
4634

47-
// http://vuejs.github.io/vue-loader/en/configurations/extract-css.html
48-
return {
49-
css: generateLoaders(),
50-
postcss: generateLoaders(),
51-
less: generateLoaders('less'),
52-
sass: generateLoaders('sass', {indentedSyntax: true}),
53-
scss: generateLoaders('sass'),
54-
stylus: generateLoaders('stylus'),
55-
styl: generateLoaders('stylus')
35+
// Extract CSS when that option is specified
36+
// (which is the case during production build)
37+
if (options.extract) {
38+
return ExtractTextPlugin.extract({
39+
use: loaders,
40+
fallback: 'vue-style-loader'
41+
})
42+
} else {
43+
return ['vue-style-loader'].concat(loaders)
5644
}
45+
}
46+
47+
// https://vue-loader.vuejs.org/en/configurations/extract-css.html
48+
return {
49+
css: generateLoaders(),
50+
postcss: generateLoaders(),
51+
less: generateLoaders('less'),
52+
sass: generateLoaders('sass', { indentedSyntax: true }),
53+
scss: generateLoaders('sass'),
54+
stylus: generateLoaders('stylus'),
55+
styl: generateLoaders('stylus')
56+
}
5757
}
5858

5959
// Generate loaders for standalone style files (outside of .vue)
6060
exports.styleLoaders = function (options) {
61-
var output = []
62-
var loaders = exports.cssLoaders(options)
63-
for (var extension in loaders) {
64-
var loader = loaders[extension]
65-
output.push({
66-
test: new RegExp('\\.' + extension + '$'),
67-
use: loader
68-
})
69-
}
70-
return output
61+
var output = []
62+
var loaders = exports.cssLoaders(options)
63+
for (var extension in loaders) {
64+
var loader = loaders[extension]
65+
output.push({
66+
test: new RegExp('\\.' + extension + '$'),
67+
use: loader
68+
})
69+
}
70+
return output
7171
}

src/App.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@
99
name: 'APP'
1010
}
1111
</script>
12+
13+
<style lang="scss">
14+
@import './styles/index.scss'; // 全局自定义的css样式
15+
</style>

src/main.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ import router from './router';
66
import store from './store';
77
import ElementUI from 'element-ui';
88
import 'element-ui/lib/theme-default/index.css';
9-
import 'assets/custom-theme/index.css'; // 换肤版本element-ui css https://github.com/PanJiaChen/custom-element-theme
9+
import 'assets/custom-theme/index.css'; // 换肤版本element-ui css
1010
import NProgress from 'nprogress'; // Progress 进度条
1111
import 'nprogress/nprogress.css';// Progress 进度条 样式
1212
import 'normalize.css/normalize.css';// normalize.css 样式格式化
13-
import 'styles/index.scss'; // 全局自定义的css样式
1413
import 'components/Icon-svg/index'; // 封装的svg组件
1514
import 'assets/iconfont/iconfont'; // iconfont 具体图标见https://github.com/PanJiaChen/vue-element-admin/wiki
1615
import * as filters from './filters'; // 全局vue filter

src/styles/index.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@import './btn.scss';
22
@import './element-ui.scss';
3-
@import "./mixin.scss";
3+
@import './mixin.scss';
44
body {
55
-moz-osx-font-smoothing: grayscale;
66
-webkit-font-smoothing: antialiased;
@@ -108,7 +108,6 @@ code {
108108
margin-top: 30px;
109109
}
110110

111-
112111
.editor-container .CodeMirror {
113112
height: 100%!important;
114113
}

0 commit comments

Comments
 (0)