Use npm's font-awesome instead of bower, and some optimizations

This commit is contained in:
An Phan 2016-02-13 13:09:45 +08:00
parent 9068a1a530
commit e7c3b78f20
6 changed files with 5 additions and 7 deletions

View file

@ -22,7 +22,6 @@
"tests"
],
"devDependencies": {
"plyr": "~1.3.6",
"fontawesome": "~4.5.0"
"plyr": "~1.3.6"
}
}

View file

@ -18,7 +18,7 @@ elixir(function (mix) {
mix.sass('app.scss');
mix.copy('resources/assets/img', 'public/img')
.copy('bower_components/fontawesome/fonts', 'public/build/fonts')
.copy('node_modules/font-awesome/fonts', 'public/build/fonts')
.copy('resources/assets/fonts', 'public/build/fonts');
mix.scripts([
@ -27,8 +27,7 @@ elixir(function (mix) {
], 'public/js/vendors.js', './')
.styles([
'resources/assets/css/**/*.css',
'bower_components/fontawesome/css/font-awesome.min.css',
'bower_components/plyr/dist/plyr.css',
'node_modules/font-awesome/css/font-awesome.min.css',
'node_modules/rangeslider.js/dist/rangeslider.css'
], 'public/css/vendors.css', './');

View file

@ -24,6 +24,7 @@
"browserify-hmr": "^0.3.1",
"chai": "^3.4.1",
"cross-env": "^1.0.7",
"font-awesome": "^4.5.0",
"gulp": "^3.9.0",
"gulp-util": "^3.0.7",
"ismobilejs": "^0.3.9",

View file

@ -500,8 +500,6 @@
$volume-track-height: 8px;
@import "resources/assets/sass/vendors/_plyr.scss";
// Some little tweaks here and there
.player {
width: 100%;

View file

@ -3,4 +3,5 @@
@import "partials/_vars.scss";
@import "partials/_mixins.scss";
@import "vendor/_plyr.scss";
@import "partials/_shared.scss";