From 7e01af67d3ef3faaa121f5e0e3257c73b36b9fba Mon Sep 17 00:00:00 2001
From: Alexander Yakovlev <keloero@oreolek.ru>
Date: Thu, 11 Feb 2016 12:19:03 +0700
Subject: [PATCH] Styling upgrade, initialization fix

---
 html/index.html   |  5 +++--
 lib/salet.coffee  |  1 -
 lib/view.coffee   |  6 +++---
 sass/_mixins.scss |  9 ++++-----
 sass/bootstrap    |  2 +-
 sass/main.scss    | 10 ++++------
 6 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/html/index.html b/html/index.html
index e697423..1e5cd6d 100644
--- a/html/index.html
+++ b/html/index.html
@@ -52,8 +52,9 @@
       </div>
       <div id="tools_wrapper" class="row">
         <div class='ways'>
-          <h2>Other rooms</h2>
-          <div id="ways"></div>
+          <small class="text-muted" id="ways_hint">Click these links to explore other rooms</small>
+          <ul class="nav nav-pills" id="ways">
+          </ul>
         </div>
         <div class="menu">
           <ul class="nav nav-pills">
diff --git a/lib/salet.coffee b/lib/salet.coffee
index ec7c763..c57a889 100644
--- a/lib/salet.coffee
+++ b/lib/salet.coffee
@@ -408,7 +408,6 @@ class Salet
       else
         @progress.seed = new Date().toString()
 
-        character = new Character()
         @rnd = new Random(@progress.seed)
         @progress.sequence = [{link:@start, when:0}]
 
diff --git a/lib/view.coffee b/lib/view.coffee
index e3db114..21d8cbe 100644
--- a/lib/view.coffee
+++ b/lib/view.coffee
@@ -266,14 +266,14 @@ class SaletView
     if ways then for way in ways
       if salet.rooms[way]?
         title = salet.rooms[way].title.fcall(this, name)
-        content += way_to(title, way)
+        content += "<li class='nav-item'><a class='nav-link' href='#{way}'>#{title}</a></li>"
         distances.push({
           key: way
           distance: salet.rooms[way].distance
         })
-      document.querySelector(".ways h2").style.display = "block"
+      document.querySelector(".ways #ways_hint").style.display = "block"
     else
-      document.querySelector(".ways h2").style.display = "none"
+      document.querySelector(".ways #ways_hint").style.display = "none"
     document.getElementById("ways").innerHTML = content
     min = Infinity
     min_key = []
diff --git a/sass/_mixins.scss b/sass/_mixins.scss
index 5916f78..968aefb 100644
--- a/sass/_mixins.scss
+++ b/sass/_mixins.scss
@@ -1,19 +1,18 @@
 @mixin halfcolumn() {
   @include make-col();
   @media (min-width: breakpoint-min(sm)) {
-    @include make-col-span(6);
+    @include make-col(6);
   }
   @media (max-width: breakpoint-max(xs)) {
-    @include make-col-span(12);
+    @include make-col(12);
   }
 }
 @mixin col($sm-width, $xs-width) {
-  @include make-col;
   @media (min-width: breakpoint-min(sm)) {
-    @include make-col-span($sm-width);
+    @include make-col($sm-width);
   }
   @media (max-width: breakpoint-max(xs)) {
-    @include make-col-span($xs-width);
+    @include make-col($xs-width);
   }
 }
 
diff --git a/sass/bootstrap b/sass/bootstrap
index 6384789..a1bf344 160000
--- a/sass/bootstrap
+++ b/sass/bootstrap
@@ -1 +1 @@
-Subproject commit 6384789f952c297356a94aded5900d199d09ae87
+Subproject commit a1bf344c4f041ad88acaf5b2b3777c733d3afe40
diff --git a/sass/main.scss b/sass/main.scss
index 1ac7a3a..a1e1a06 100644
--- a/sass/main.scss
+++ b/sass/main.scss
@@ -151,22 +151,20 @@ body {
   color: darken($body-color, 10%);
   font-size: smaller;
   #footleft {
-    @include make-col();
     @media (min-width: breakpoint-min(sm)) {
-      @include make-col-span(10);
+      @include make-col(10);
     }
     @media (max-width: breakpoint-max(xs)) {
-      @include make-col-span(12);
+      @include make-col(12);
     }
   }
   #footright {
     text-align: right;
-    @include make-col();
     @media (min-width: breakpoint-min(sm)) {
-      @include make-col-span(2);
+      @include make-col(2);
     }
     @media (max-width: breakpoint-max(xs)) {
-      @include make-col-span(12);
+      @include make-col(12);
       margin-bottom: 1em;
     }
   }