From 9ce79a4fb7f70b8af94fdd9dbb23783b85ad79a9 Mon Sep 17 00:00:00 2001
From: Alexander Yakovlev <keloero@oreolek.ru>
Date: Tue, 28 Jun 2016 12:21:11 +0700
Subject: [PATCH] Bootstrap as a `npm` module instead of a submodule

---
 .gitmodules       |  4 ----
 game/begin.coffee |  2 --
 html/index.html   | 11 +++++------
 package.json      |  3 ++-
 sass/_mixins.scss |  9 +++++----
 sass/bootstrap    |  1 -
 sass/main.scss    | 33 +++++++++++++++------------------
 7 files changed, 27 insertions(+), 36 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 sass/bootstrap

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 0648662..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-[submodule "sass/bootstrap"]
-	path = sass/bootstrap
-	url = https://github.com/twbs/bootstrap.git
-	branch = v4-dev
diff --git a/game/begin.coffee b/game/begin.coffee
index e2067a0..861df9a 100644
--- a/game/begin.coffee
+++ b/game/begin.coffee
@@ -24,8 +24,6 @@ textlink = (content, ref) ->
   return "<a href='./_writer_#{ref}' class='once'>#{content}</a>"
 actlink = (content, ref) ->
   return "<a href='./#{ref}' class='once'>#{content}</a>"
-textcycle = (content, ref) ->
-  return "<a href='./_replacer_#{ref}' class='cycle' id='#{ref}'>#{content}</a>"
 
 # The first room of the game.
 # For accessibility reasons the text is provided in HTML, not here.
diff --git a/html/index.html b/html/index.html
index 7bcd9b3..5d9c566 100644
--- a/html/index.html
+++ b/html/index.html
@@ -60,12 +60,11 @@
 
       <div id="legal" class="row">
         <div id="footleft">
-          <p>The game was written by <em>(you should put your name here)</em></p>
-          <p>Approximate play time: not measured.</p>
-          <p>If you want to know how this game was made, check out <a
-            href="http://git.oreolek.ru/oreolek/salet" target="_blank">the
-            source code.</a></p>
-          <p>Betatesting credit: none yet</p>
+          <p>
+            If you want to know how this game was made, check out <a
+            href="https://git.oreolek.ru/oreolek/salet" target="_blank">the
+            source code.</a>
+          </p>
         </div>
         <div id="footright">
           <p id='buttons'>
diff --git a/package.json b/package.json
index 27b170f..5296d0e 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "gulp-zip": "^3.0.2",
     "vinyl-buffer": "^1.0.0",
     "vinyl-source-stream": "^1.1.0",
-    "watchify": "^3.1.0"
+    "watchify": "^3.1.0",
+    "bootstrap": "^4.0.0-alpha.2"
   }
 }
diff --git a/sass/_mixins.scss b/sass/_mixins.scss
index 968aefb..6e3e9bf 100644
--- a/sass/_mixins.scss
+++ b/sass/_mixins.scss
@@ -1,18 +1,19 @@
 @mixin halfcolumn() {
   @include make-col();
   @media (min-width: breakpoint-min(sm)) {
-    @include make-col(6);
+    @include make-col-span(6);
   }
   @media (max-width: breakpoint-max(xs)) {
-    @include make-col(12);
+    @include make-col-span(12);
   }
 }
 @mixin col($sm-width, $xs-width) {
+  @include make-col();
   @media (min-width: breakpoint-min(sm)) {
-    @include make-col($sm-width);
+    @include make-col-span($sm-width);
   }
   @media (max-width: breakpoint-max(xs)) {
-    @include make-col($xs-width);
+    @include make-col-span($xs-width);
   }
 }
 
diff --git a/sass/bootstrap b/sass/bootstrap
deleted file mode 160000
index d8b1b92..0000000
--- a/sass/bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d8b1b92f66d57ac888f7ab49ca236b7acfa47a2e
diff --git a/sass/main.scss b/sass/main.scss
index 4e7c30a..0f53b84 100644
--- a/sass/main.scss
+++ b/sass/main.scss
@@ -1,21 +1,19 @@
 @import "mixins";
 @import "variables";
 // Bootstrap v4 stripped core
-@import "bootstrap/scss/variables";
-@import "bootstrap/scss/mixins";
-@import "bootstrap/scss/normalize";
-@import "bootstrap/scss/print";
-@import "bootstrap/scss/reboot";
-@import "bootstrap/scss/type";
-@import "bootstrap/scss/images";
-@import "bootstrap/scss/grid";
-@import "bootstrap/scss/buttons";
+@import "../node_modules/bootstrap/scss/variables";
+@import "../node_modules/bootstrap/scss/mixins";
+@import "../node_modules/bootstrap/scss/normalize";
+@import "../node_modules/bootstrap/scss/print";
+@import "../node_modules/bootstrap/scss/reboot";
+@import "../node_modules/bootstrap/scss/type";
+@import "../node_modules/bootstrap/scss/images";
+@import "../node_modules/bootstrap/scss/grid";
+@import "../node_modules/bootstrap/scss/buttons";
 
-//@import "bootstrap/scss/animation";
-//@import "bootstrap/scss/dropdown";
-@import "bootstrap/scss/nav";
-@import "bootstrap/scss/responsive-embed";
-@import "bootstrap/scss/utilities";
+@import "../node_modules/bootstrap/scss/nav";
+@import "../node_modules/bootstrap/scss/responsive-embed";
+@import "../node_modules/bootstrap/scss/utilities";
 
 body {
   overflow-y: scroll;
@@ -30,10 +28,8 @@ body {
     @include make-col-offset(1);
   }
   .label {
-    overflow: hidden;
-    margin: auto;
+    margin: 1em auto;
     max-width: 18em;
-    position: relative;
     text-align: center;
   }
   .subtitle {
@@ -157,7 +153,8 @@ body {
   #footright {
     text-align: right;
     @media (min-width: breakpoint-min(sm)) {
-      @include make-col(4);
+      @include make-col(3);
+      @include make-col-offset(2);
     }
     @media (max-width: breakpoint-max(xs)) {
       @include make-col(12);