diff --git a/client/index.html b/client/index.html index 4773550..1c5c2b8 100644 --- a/client/index.html +++ b/client/index.html @@ -5,6 +5,7 @@ Gwent + diff --git a/client/scss/main.scss b/client/scss/main.scss index 612ea3c..517f834 100644 --- a/client/scss/main.scss +++ b/client/scss/main.scss @@ -1,7 +1,6 @@ //@import "style"; @import "backbone.modal"; @import "backbone.modal.theme"; -@import "cards"; $height: 600px; $game-height: 800px; diff --git a/gulpfile.js b/gulpfile.js index 92c6e43..cec4bf0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -112,7 +112,7 @@ gulp.task("sprite", ["resize lg"], function(){ }*/ sprity.src({ src: "./assets/cards/**/*.png", - style: "_cards.scss", + style: "cards.css", //"style-type": "scss", processor: "css", engine: "gm", @@ -124,7 +124,8 @@ gulp.task("sprite", ["resize lg"], function(){ margin: 0 //template: "./client/scss/_cards.hbs" }) - .pipe(gulpif("*.png", gulp.dest("./public/build/"), gulp.dest("./client/scss/"))); + //.pipe(gulpif("*.png", gulp.dest("./public/build/"), gulp.dest("./client/scss/"))); + .pipe(gulp.dest("./public/build/")); }) diff --git a/public/index.html b/public/index.html deleted file mode 100644 index 4773550..0000000 --- a/public/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Gwent - - - - - - - - - diff --git a/server/Matchmaker.js b/server/Matchmaker.js index 3052f5c..9bc6d79 100644 --- a/server/Matchmaker.js +++ b/server/Matchmaker.js @@ -1,4 +1,3 @@ -var Promise = require("promise"); var Matchmaker = (function(){ var Matchmaker = function(){