diff --git a/src/assets/fonts/iconfont.eot b/src/assets/fonts/iconfont.eot new file mode 100644 index 0000000..eba8d29 Binary files /dev/null and b/src/assets/fonts/iconfont.eot differ diff --git a/src/assets/fonts/iconfont.svg b/src/assets/fonts/iconfont.svg new file mode 100644 index 0000000..a9374de --- /dev/null +++ b/src/assets/fonts/iconfont.svg @@ -0,0 +1,732 @@ + + + + +Created by FontForge 20120731 at Sun Nov 20 19:53:22 2016 + By admin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/fonts/iconfont.ttf b/src/assets/fonts/iconfont.ttf new file mode 100644 index 0000000..09255a1 Binary files /dev/null and b/src/assets/fonts/iconfont.ttf differ diff --git a/src/assets/fonts/iconfont.woff b/src/assets/fonts/iconfont.woff new file mode 100644 index 0000000..4191b87 Binary files /dev/null and b/src/assets/fonts/iconfont.woff differ diff --git a/src/index.html b/src/index.html index d021b1e..d0c606f 100644 --- a/src/index.html +++ b/src/index.html @@ -10,7 +10,6 @@
- diff --git a/src/theme.js b/src/theme.js index 3cf964f..5abfb57 100644 --- a/src/theme.js +++ b/src/theme.js @@ -6,6 +6,7 @@ module.exports = () => { '@shadow-1-down': '4px 4px 40px @shadow-color', '@border-color-split':'#f4f4f4', '@border-color-base':'#e5e5e5', - '@font-family':'monospace,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", SimSun, sans-serif' + // '@icon-url':'"/src/assets/fonts/iconfont"', + '@font-family':'monospace,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", SimSun, sans-serif' }; }; diff --git a/webpack.config.js b/webpack.config.js index 4b8fe8f..9c6031b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,5 +1,6 @@ const fs = require('fs') const path = require('path') +const webpack = require('atool-build/lib/webpack') module.exports = function(webpackConfig, env) { webpackConfig.babel.plugins.push('transform-runtime') @@ -20,6 +21,11 @@ module.exports = function(webpackConfig, env) { webpackConfig.babel.plugins.push('dev-expression') } + // Don't extract common.js and common.css + webpackConfig.plugins = webpackConfig.plugins.filter(function(plugin) { + return !(plugin instanceof webpack.optimize.CommonsChunkPlugin); + }) + // Support CSS Modules // Parse all less files as css module. webpackConfig.module.loaders.forEach(function(loader, index) {