From b84b45b0f12e0a1061a056af7b98c339cf5d6be4 Mon Sep 17 00:00:00 2001
From: Alexander Yakovlev <keloero@oreolek.ru>
Date: Fri, 10 Nov 2017 00:04:49 +0700
Subject: [PATCH] Salet 2.0 / Bootstrap 4 update

---
 game/begin.coffee    |  3 ++-
 package.json         | 32 ++++++++++++++++----------------
 sass/_variables.scss |  4 ++--
 sass/main.scss       |  7 +++----
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/game/begin.coffee b/game/begin.coffee
index 30dee01..dddbf5e 100644
--- a/game/begin.coffee
+++ b/game/begin.coffee
@@ -26,7 +26,7 @@ $.getJSON('game/procgen/'+i18n.lang+'.json', (data) ->
   $.holdReady( false )
 )
 
-salet.init = () ->
+$(document).on("init", () ->
   salet.character.lastBeat = () ->
     return salet.progress.sequence.length - salet.character.beat
   salet.character.newBeat = () ->
@@ -38,6 +38,7 @@ salet.init = () ->
     audio.currentTime = 0
     audio.volume = 1.0
     audio.play()
+)
 
 $(document).ready(() ->
   window.addEventListener('popstate', (event) ->
diff --git a/package.json b/package.json
index fa5314a..2c29363 100644
--- a/package.json
+++ b/package.json
@@ -1,28 +1,28 @@
 {
   "dependencies": {
-    "cson": "^4.0.0",
-    "glob": "^7.1.1",
-    "improv": "^0.8.0",
-    "salet": "^1.5.4"
+    "cson": "^4.1.0",
+    "glob": "^7.1.2",
+    "improv": "^1.0.0",
+    "salet": "^2.0.0"
   },
   "private": true,
   "devDependencies": {
-    "babel-polyfill": "^6.20.0",
+    "babel-polyfill": "^6.26.0",
     "bootstrap": "^4.0.0-alpha.2",
-    "browser-sync": "^2.18.2",
-    "browserify": "^13.1.1",
-    "browserify-shim": "^3.8.8",
-    "coffee-script": "^1.12.0",
-    "coffeeify": "^2.1.0",
+    "browser-sync": "^2.18.13",
+    "browserify": "^14.5.0",
+    "browserify-shim": "^3.8.14",
+    "coffeescript": "^2.0.0",
+    "coffeeify": "^3.0.1",
     "gulp": "^3.8.11",
-    "gulp-coffee": "^2.3.3",
+    "gulp-coffee": "^2.3.4",
     "gulp-concat": "^2.6.1",
-    "gulp-sass": "^3.0.0",
-    "gulp-uglify": "^2.0.0",
-    "gulp-util": "^3.0.4",
-    "gulp-zip": "^3.0.2",
+    "gulp-sass": "^3.1.0",
+    "gulp-uglify": "^3.0.0",
+    "gulp-util": "^3.0.8",
+    "gulp-zip": "^4.0.0",
     "vinyl-buffer": "^1.0.0",
     "vinyl-source-stream": "^1.1.0",
-    "watchify": "^3.1.0"
+    "watchify": "^3.9.0"
   }
 }
diff --git a/sass/_variables.scss b/sass/_variables.scss
index 4d31b92..2b7fd6f 100644
--- a/sass/_variables.scss
+++ b/sass/_variables.scss
@@ -9,8 +9,8 @@ $btn-bg: grey;
 $btn-color: lighten($btn-bg, 50%);
 $secondary-bg: #F1EED9;
 
-$brand-primary: lighten($body-color, 20%);
-$brand-danger: darken($body-bg, 30%);
+$primary: lighten($body-color, 20%);
+$danger: darken($body-bg, 30%);
 
 $waycolor: $link-color;
 $text_background: $body-bg; // can be btn-bg
diff --git a/sass/main.scss b/sass/main.scss
index c6aaff7..4dfd629 100644
--- a/sass/main.scss
+++ b/sass/main.scss
@@ -2,9 +2,9 @@
 @import "mixins";
 @import "variables";
 // Bootstrap v4 stripped core
-@import "../node_modules/bootstrap/scss/variables";
+@import "../node_modules/bootstrap/scss/functions";
 @import "../node_modules/bootstrap/scss/mixins";
-@import "../node_modules/bootstrap/scss/normalize";
+@import "../node_modules/bootstrap/scss/variables";
 @import "../node_modules/bootstrap/scss/print";
 @import "../node_modules/bootstrap/scss/reboot";
 @import "../node_modules/bootstrap/scss/type";
@@ -13,8 +13,7 @@
 @import "../node_modules/bootstrap/scss/buttons";
 
 @import "../node_modules/bootstrap/scss/nav";
-@import "../node_modules/bootstrap/scss/responsive-embed";
-@import "../node_modules/bootstrap/scss/utilities";
+@import "../node_modules/bootstrap/scss/navbar";
 
 body {
   overflow-y: scroll;