diff --git a/.gitignore b/.gitignore index edf4fd82..1b693e2e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ storage/textures/* node_modules/* resources/src/bower_components/* koala-config.json +resources/dist/css/* +resources/dist/js/* diff --git a/gulpfile.js b/gulpfile.js index 862b460d..75a5c5eb 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -2,7 +2,7 @@ * @Author: prpr * @Date: 2016-07-21 13:38:26 * @Last Modified by: printempw -* @Last Modified time: 2016-09-15 11:09:48 +* @Last Modified time: 2016-09-24 23:44:24 */ var gulp = require('gulp'), @@ -41,12 +41,12 @@ var vendor_css = [ var replacements = [ ['@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);', ''], - ['../fonts/glyphicons', '../../fonts/glyphicons'], - ['../fonts/fontawesome', '../../fonts/fontawesome'], - ['blue.png', '"../../images/blue.png"'], - ['blue@2x.png', '"../../images/blue@2x.png"'], - ['../img/loading.gif', '"../../images/loading.gif"'], - ['../img/loading-sm.gif', '"../../images/loading-sm.gif"'] + ['../fonts/glyphicons', '../fonts/glyphicons'], + ['../fonts/fontawesome', '../fonts/fontawesome'], + ['blue.png', '"../images/blue.png"'], + ['blue@2x.png', '"../images/blue@2x.png"'], + ['../img/loading.gif', '"../images/loading.gif"'], + ['../img/loading-sm.gif', '"../images/loading-sm.gif"'] ]; elixir(function(mix) { @@ -62,13 +62,13 @@ elixir(function(mix) { .copy([ 'resources/src/bower_components/bootstrap/dist/fonts/**', 'resources/src/bower_components/font-awesome/fonts/**' - ], 'resources/fonts/') + ], 'resources/dist/fonts/') .copy([ 'resources/src/bower_components/iCheck/skins/square/blue.png', 'resources/src/bower_components/iCheck/skins/square/blue@2x.png', 'resources/src/bower_components/bootstrap-fileinput/img/loading.gif', 'resources/src/bower_components/bootstrap-fileinput/img/loading-sm.gif' - ], 'resources/images/') + ], 'resources/dist/images/') .task('sass') .task('uglify'); diff --git a/resources/dist/.gitignore b/resources/dist/.gitignore deleted file mode 100644 index 8f4803c0..00000000 --- a/resources/dist/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* -!public/ -!.gitignore diff --git a/resources/fonts/FontAwesome.otf b/resources/dist/fonts/FontAwesome.otf similarity index 100% rename from resources/fonts/FontAwesome.otf rename to resources/dist/fonts/FontAwesome.otf diff --git a/resources/fonts/fontawesome-webfont.eot b/resources/dist/fonts/fontawesome-webfont.eot similarity index 100% rename from resources/fonts/fontawesome-webfont.eot rename to resources/dist/fonts/fontawesome-webfont.eot diff --git a/resources/fonts/fontawesome-webfont.svg b/resources/dist/fonts/fontawesome-webfont.svg similarity index 100% rename from resources/fonts/fontawesome-webfont.svg rename to resources/dist/fonts/fontawesome-webfont.svg diff --git a/resources/fonts/fontawesome-webfont.ttf b/resources/dist/fonts/fontawesome-webfont.ttf similarity index 100% rename from resources/fonts/fontawesome-webfont.ttf rename to resources/dist/fonts/fontawesome-webfont.ttf diff --git a/resources/fonts/fontawesome-webfont.woff b/resources/dist/fonts/fontawesome-webfont.woff similarity index 100% rename from resources/fonts/fontawesome-webfont.woff rename to resources/dist/fonts/fontawesome-webfont.woff diff --git a/resources/fonts/fontawesome-webfont.woff2 b/resources/dist/fonts/fontawesome-webfont.woff2 similarity index 100% rename from resources/fonts/fontawesome-webfont.woff2 rename to resources/dist/fonts/fontawesome-webfont.woff2 diff --git a/resources/fonts/glyphicons-halflings-regular.eot b/resources/dist/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from resources/fonts/glyphicons-halflings-regular.eot rename to resources/dist/fonts/glyphicons-halflings-regular.eot diff --git a/resources/fonts/glyphicons-halflings-regular.svg b/resources/dist/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from resources/fonts/glyphicons-halflings-regular.svg rename to resources/dist/fonts/glyphicons-halflings-regular.svg diff --git a/resources/fonts/glyphicons-halflings-regular.ttf b/resources/dist/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from resources/fonts/glyphicons-halflings-regular.ttf rename to resources/dist/fonts/glyphicons-halflings-regular.ttf diff --git a/resources/fonts/glyphicons-halflings-regular.woff b/resources/dist/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from resources/fonts/glyphicons-halflings-regular.woff rename to resources/dist/fonts/glyphicons-halflings-regular.woff diff --git a/resources/fonts/glyphicons-halflings-regular.woff2 b/resources/dist/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from resources/fonts/glyphicons-halflings-regular.woff2 rename to resources/dist/fonts/glyphicons-halflings-regular.woff2 diff --git a/resources/fonts/minecraft.eot b/resources/dist/fonts/minecraft.eot similarity index 100% rename from resources/fonts/minecraft.eot rename to resources/dist/fonts/minecraft.eot diff --git a/resources/fonts/minecraft.svg b/resources/dist/fonts/minecraft.svg similarity index 100% rename from resources/fonts/minecraft.svg rename to resources/dist/fonts/minecraft.svg diff --git a/resources/fonts/minecraft.ttf b/resources/dist/fonts/minecraft.ttf similarity index 100% rename from resources/fonts/minecraft.ttf rename to resources/dist/fonts/minecraft.ttf diff --git a/resources/fonts/minecraft.woff b/resources/dist/fonts/minecraft.woff similarity index 100% rename from resources/fonts/minecraft.woff rename to resources/dist/fonts/minecraft.woff diff --git a/resources/fonts/minecraft.woff2 b/resources/dist/fonts/minecraft.woff2 similarity index 100% rename from resources/fonts/minecraft.woff2 rename to resources/dist/fonts/minecraft.woff2 diff --git a/resources/fonts/ubuntu.woff2 b/resources/dist/fonts/ubuntu.woff2 similarity index 100% rename from resources/fonts/ubuntu.woff2 rename to resources/dist/fonts/ubuntu.woff2 diff --git a/resources/images/bg.jpg b/resources/dist/images/bg.jpg similarity index 100% rename from resources/images/bg.jpg rename to resources/dist/images/bg.jpg diff --git a/resources/images/blue.png b/resources/dist/images/blue.png similarity index 100% rename from resources/images/blue.png rename to resources/dist/images/blue.png diff --git a/resources/images/blue@2x.png b/resources/dist/images/blue@2x.png similarity index 100% rename from resources/images/blue@2x.png rename to resources/dist/images/blue@2x.png diff --git a/resources/images/favicon.ico b/resources/dist/images/favicon.ico similarity index 100% rename from resources/images/favicon.ico rename to resources/dist/images/favicon.ico diff --git a/resources/images/loading-sm.gif b/resources/dist/images/loading-sm.gif similarity index 100% rename from resources/images/loading-sm.gif rename to resources/dist/images/loading-sm.gif diff --git a/resources/images/loading.gif b/resources/dist/images/loading.gif similarity index 100% rename from resources/images/loading.gif rename to resources/dist/images/loading.gif diff --git a/resources/src/sass/style.scss b/resources/src/sass/style.scss index 46430a51..965df47a 100644 --- a/resources/src/sass/style.scss +++ b/resources/src/sass/style.scss @@ -2,24 +2,24 @@ * @Author: printempw * @Date: 2016-06-04 20:55:09 * @Last Modified by: printempw - * @Last Modified time: 2016-09-14 22:35:45 + * @Last Modified time: 2016-09-24 23:45:26 */ $font_stack: Ubuntu, 'Segoe UI', 'Microsoft Yahei', 'Microsoft Jhenghei', sans-serif; @font-face { font-family: 'Ubuntu'; - src: url('../../fonts/ubuntu.woff2') format('woff2'); + src: url('../fonts/ubuntu.woff2') format('woff2'); } @font-face { font-family: 'Minecraft'; - src: url('../../fonts/minecraft.eot'); - src: url('../../fonts/minecraft.eot') format('embedded-opentype'), - url('../../fonts/minecraft.woff2') format('woff2'), - url('../../fonts/minecraft.woff') format('woff'), - url('../../fonts/minecraft.ttf') format('truetype'), - url('../../fonts/minecraft.svg#minecraft') format('svg'); + src: url('../fonts/minecraft.eot'); + src: url('../fonts/minecraft.eot') format('embedded-opentype'), + url('../fonts/minecraft.woff2') format('woff2'), + url('../fonts/minecraft.woff') format('woff'), + url('../fonts/minecraft.ttf') format('truetype'), + url('../fonts/minecraft.svg#minecraft') format('svg'); } body, h1, h2, h3, h4, h5, h6, .logo {