From 9a7f8857c301c5d2fc07b09526c08158bfeecf37 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Sat, 19 Mar 2016 16:03:32 -0400 Subject: [PATCH] Move fonts to resources/assets/fonts, mark everything in public/fonts in the gitignore, and add a copy task for resources/assets/fonts/* to public/fonts --- .gitignore | 4 +--- gulpfile.js | 1 + .../assets}/fonts/OpenSans-Regular.eot | Bin .../assets}/fonts/OpenSans-Regular.svg | 0 .../assets}/fonts/OpenSans-Regular.ttf | Bin .../assets}/fonts/OpenSans-Regular.woff | Bin 6 files changed, 2 insertions(+), 3 deletions(-) rename {public => resources/assets}/fonts/OpenSans-Regular.eot (100%) rename {public => resources/assets}/fonts/OpenSans-Regular.svg (100%) rename {public => resources/assets}/fonts/OpenSans-Regular.ttf (100%) rename {public => resources/assets}/fonts/OpenSans-Regular.woff (100%) diff --git a/.gitignore b/.gitignore index 4d91a82..26db4a7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,7 @@ /public/build /public/css /public/js -/public/fonts/FontAwesome.otf -/public/fonts/fontawesome-webfont.* -/public/fonts/glyphicons-halflings-regular.* +/public/fonts /public/uploads /storage/exports .env diff --git a/gulpfile.js b/gulpfile.js index 0bd4f82..1abbc46 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -45,6 +45,7 @@ elixir(function(mix) { mix .copy('bower_components/bootstrap/dist/fonts/**', 'public/fonts') .copy('bower_components/font-awesome/fonts/**', 'public/fonts') + .copy('resources/assets/fonts/**', 'public/fonts') .less('dashboard.less', 'public/css/dashboard.css', { paths: lessPaths, plugins: [lessglob] }) .less('app.less', 'public/css/app.css', { paths: lessPaths, plugins: [lessglob] }) .scripts(jsLocal, 'public/js/app.js', 'resources/assets/js/') diff --git a/public/fonts/OpenSans-Regular.eot b/resources/assets/fonts/OpenSans-Regular.eot similarity index 100% rename from public/fonts/OpenSans-Regular.eot rename to resources/assets/fonts/OpenSans-Regular.eot diff --git a/public/fonts/OpenSans-Regular.svg b/resources/assets/fonts/OpenSans-Regular.svg similarity index 100% rename from public/fonts/OpenSans-Regular.svg rename to resources/assets/fonts/OpenSans-Regular.svg diff --git a/public/fonts/OpenSans-Regular.ttf b/resources/assets/fonts/OpenSans-Regular.ttf similarity index 100% rename from public/fonts/OpenSans-Regular.ttf rename to resources/assets/fonts/OpenSans-Regular.ttf diff --git a/public/fonts/OpenSans-Regular.woff b/resources/assets/fonts/OpenSans-Regular.woff similarity index 100% rename from public/fonts/OpenSans-Regular.woff rename to resources/assets/fonts/OpenSans-Regular.woff