From 72ba4f30ba777fe8f321dd43c1316954b635da51 Mon Sep 17 00:00:00 2001 From: taylor <709161610@qq.com> Date: Thu, 17 Nov 2016 09:56:09 +0800 Subject: [PATCH] =?UTF-8?q?font-awesome=E6=94=B9=E6=88=90npm=E5=AE=89?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 2 +- package.json | 1 + src/App.vue | 2 +- src/assets/font-awesome-4.7.0/HELP-US-OUT.txt | 7 - .../font-awesome-4.7.0/css/font-awesome.css | 2337 -------------- .../css/font-awesome.min.css | 4 - .../font-awesome-4.7.0/fonts/FontAwesome.otf | Bin 134808 -> 0 bytes .../fonts/fontawesome-webfont.eot | Bin 165742 -> 0 bytes .../fonts/fontawesome-webfont.svg | 2671 ----------------- .../fonts/fontawesome-webfont.ttf | Bin 165548 -> 0 bytes .../fonts/fontawesome-webfont.woff | Bin 98024 -> 0 bytes .../fonts/fontawesome-webfont.woff2 | Bin 77160 -> 0 bytes .../font-awesome-4.7.0/less/animated.less | 34 - .../less/bordered-pulled.less | 25 - src/assets/font-awesome-4.7.0/less/core.less | 12 - .../font-awesome-4.7.0/less/fixed-width.less | 6 - .../font-awesome-4.7.0/less/font-awesome.less | 18 - src/assets/font-awesome-4.7.0/less/icons.less | 789 ----- .../font-awesome-4.7.0/less/larger.less | 13 - src/assets/font-awesome-4.7.0/less/list.less | 19 - .../font-awesome-4.7.0/less/mixins.less | 60 - src/assets/font-awesome-4.7.0/less/path.less | 15 - .../less/rotated-flipped.less | 20 - .../less/screen-reader.less | 5 - .../font-awesome-4.7.0/less/stacked.less | 20 - .../font-awesome-4.7.0/less/variables.less | 800 ----- .../font-awesome-4.7.0/scss/_animated.scss | 34 - .../scss/_bordered-pulled.scss | 25 - src/assets/font-awesome-4.7.0/scss/_core.scss | 12 - .../font-awesome-4.7.0/scss/_fixed-width.scss | 6 - .../font-awesome-4.7.0/scss/_icons.scss | 789 ----- .../font-awesome-4.7.0/scss/_larger.scss | 13 - src/assets/font-awesome-4.7.0/scss/_list.scss | 19 - .../font-awesome-4.7.0/scss/_mixins.scss | 60 - src/assets/font-awesome-4.7.0/scss/_path.scss | 15 - .../scss/_rotated-flipped.scss | 20 - .../scss/_screen-reader.scss | 5 - .../font-awesome-4.7.0/scss/_stacked.scss | 20 - .../font-awesome-4.7.0/scss/_variables.scss | 800 ----- .../font-awesome-4.7.0/scss/font-awesome.scss | 18 - 40 files changed, 3 insertions(+), 8693 deletions(-) delete mode 100644 src/assets/font-awesome-4.7.0/HELP-US-OUT.txt delete mode 100644 src/assets/font-awesome-4.7.0/css/font-awesome.css delete mode 100644 src/assets/font-awesome-4.7.0/css/font-awesome.min.css delete mode 100644 src/assets/font-awesome-4.7.0/fonts/FontAwesome.otf delete mode 100644 src/assets/font-awesome-4.7.0/fonts/fontawesome-webfont.eot delete mode 100644 src/assets/font-awesome-4.7.0/fonts/fontawesome-webfont.svg delete mode 100644 src/assets/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf delete mode 100644 src/assets/font-awesome-4.7.0/fonts/fontawesome-webfont.woff delete mode 100644 src/assets/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 delete mode 100644 src/assets/font-awesome-4.7.0/less/animated.less delete mode 100644 src/assets/font-awesome-4.7.0/less/bordered-pulled.less delete mode 100644 src/assets/font-awesome-4.7.0/less/core.less delete mode 100644 src/assets/font-awesome-4.7.0/less/fixed-width.less delete mode 100644 src/assets/font-awesome-4.7.0/less/font-awesome.less delete mode 100644 src/assets/font-awesome-4.7.0/less/icons.less delete mode 100644 src/assets/font-awesome-4.7.0/less/larger.less delete mode 100644 src/assets/font-awesome-4.7.0/less/list.less delete mode 100644 src/assets/font-awesome-4.7.0/less/mixins.less delete mode 100644 src/assets/font-awesome-4.7.0/less/path.less delete mode 100644 src/assets/font-awesome-4.7.0/less/rotated-flipped.less delete mode 100644 src/assets/font-awesome-4.7.0/less/screen-reader.less delete mode 100644 src/assets/font-awesome-4.7.0/less/stacked.less delete mode 100644 src/assets/font-awesome-4.7.0/less/variables.less delete mode 100644 src/assets/font-awesome-4.7.0/scss/_animated.scss delete mode 100644 src/assets/font-awesome-4.7.0/scss/_bordered-pulled.scss delete mode 100644 src/assets/font-awesome-4.7.0/scss/_core.scss delete mode 100644 src/assets/font-awesome-4.7.0/scss/_fixed-width.scss delete mode 100644 src/assets/font-awesome-4.7.0/scss/_icons.scss delete mode 100644 src/assets/font-awesome-4.7.0/scss/_larger.scss delete mode 100644 src/assets/font-awesome-4.7.0/scss/_list.scss delete mode 100644 src/assets/font-awesome-4.7.0/scss/_mixins.scss delete mode 100644 src/assets/font-awesome-4.7.0/scss/_path.scss delete mode 100644 src/assets/font-awesome-4.7.0/scss/_rotated-flipped.scss delete mode 100644 src/assets/font-awesome-4.7.0/scss/_screen-reader.scss delete mode 100644 src/assets/font-awesome-4.7.0/scss/_stacked.scss delete mode 100644 src/assets/font-awesome-4.7.0/scss/_variables.scss delete mode 100644 src/assets/font-awesome-4.7.0/scss/font-awesome.scss diff --git a/config/index.js b/config/index.js index 207dfbd..86a9224 100644 --- a/config/index.js +++ b/config/index.js @@ -18,7 +18,7 @@ module.exports = { }, dev: { env: require('./dev.env'), - port: 8080, + port: 8081, assetsSubDirectory: 'static', assetsPublicPath: '/', proxyTable: {}, diff --git a/package.json b/package.json index 92897cf..fbae2a9 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "express": "^4.13.3", "extract-text-webpack-plugin": "^1.0.1", "file-loader": "^0.9.0", + "font-awesome": "^4.7.0", "function-bind": "^1.0.2", "html-webpack-plugin": "^2.8.1", "http-proxy-middleware": "^0.17.2", diff --git a/src/App.vue b/src/App.vue index d67b5e0..f26bc95 100644 --- a/src/App.vue +++ b/src/App.vue @@ -16,7 +16,7 @@ export default {