27 files changed, 23 insertions, 33 deletions

@@ -0,0 +1,6 @@
+//= link_tree ../images
+//= link_directory ../stylesheets .css
+//= link_directory ../javascripts .js
+//= link_tree ../../../vendor/javascript .js
+//= link_directory ../audio .aac
+//= link jquery.min.js
@@ -1,4 +0,0 @@
-//= link_directory ../stylesheets/wittle .css
-//= link_directory ../javascripts/wittle .js
-//= link_directory ../audio/wittle .aac
-//= link_directory ../images/wittle .png
@@ -0,0 +1,2 @@
+//= require jquery3
+//= require_tree .
@@ -148,7 +148,7 @@ window.Puzzle = class {
       this.grid[x] = []
       for (var y=0; y<height; y++) {
         if (x%2 === 1 && y%2 === 1) this.grid[x][y] = null
-        else this.grid[x][y] = {'type':'line', 'line':LINE_NONE}
+        else this.grid[x][y] = {'type':'line', 'line':window.LINE_NONE}
       }
     }
     // Performance: A large value which is === 0 to be used for pillar wrapping.
@@ -75,10 +75,10 @@ var proxy = {
 window.settings = new Proxy({}, proxy.init())
 
 var tracks = {
-  'start':   new Audio(src = '<%= asset_url("wittle/panel_start_tracing.aac") %>'),
-  'success': new Audio(src = '<%= asset_url("wittle/panel_success.aac") %>'),
-  'fail':    new Audio(src = '<%= asset_url("wittle/panel_failure.aac") %>'),
-  'abort':   new Audio(src = '<%= asset_url("wittle/panel_abort_tracing.aac") %>'),
+  'start':   new Audio(src = '<%= asset_url("panel_start_tracing.aac") %>'),
+  'success': new Audio(src = '<%= asset_url("panel_success.aac") %>'),
+  'fail':    new Audio(src = '<%= asset_url("panel_failure.aac") %>'),
+  'abort':   new Audio(src = '<%= asset_url("panel_abort_tracing.aac") %>'),
 }
 
 var currentAudio = null
@@ -1,14 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file. JavaScript code in this file should be added after the last require_* statement.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require jquery3
-//= require_tree .
@@ -2,11 +2,11 @@
  * This is a manifest file that'll be compiled into application.css, which will include all the files
  * listed below.
  *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ * Any CSS (and SCSS, if configured) file within this directory, lib/assets/stylesheets, or any plugin's
+ * vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
  *
@@ -3,7 +3,7 @@
 }
 
 #banner {
-  background-image: image-url("wittle/wittle_header.png");
+  background-image: image-url("wittle_header.png");
   background-size: cover;
   width: 600px;
   height: 245px;
@@ -65,7 +65,7 @@ input[type="range"]::-webkit-slider-thumb {
   appearance: none;
   -moz-appearance: none;
   -webkit-appearance: none;
-  background: image-url('wittle/slider.png');
+  background: image-url('slider.png');
   background-size: 17px 33px;
   height: 33px;
   width: 17px;
@@ -74,7 +74,7 @@ input[type="range"]::-moz-range-thumb {
   appearance: none;
   -moz-appearance: none;
   -webkit-appearance: none;
-  background: image-url('wittle/slider.png');
+  background: image-url('slider.png');
   background-size: 17px 33px;
   height: 33px;
   width: 17px;
@@ -83,7 +83,7 @@ input[type="range"]::-ms-thumb {
   appearance: none;
   -moz-appearance: none;
   -webkit-appearance: none;
-  background: image-url('wittle/slider.png');
+  background: image-url('slider.png');
   background-size: 17px 33px;
   height: 33px;
   width: 17px;
@@ -190,7 +190,7 @@ input[type="range"]::-ms-thumb {
   margin-right: 1em;
 
   a {
-    background-image: image-url("wittle/wittle_normal.png");
+    background-image: image-url("wittle_normal.png");
     background-size: cover;
     display: block;
     width: 215px;
@@ -206,7 +206,7 @@ input[type="range"]::-ms-thumb {
   margin-right: 1em;
 
   a {
-    background-image: image-url("wittle/wittle_hard.png");
+    background-image: image-url("wittle_hard.png");
     background-size: cover;
     display: block;
     width: 215px;
@@ -221,7 +221,7 @@ input[type="range"]::-ms-thumb {
   width: 215px;
 
   a {
-    background-image: image-url("wittle/wittle_expert.png");
+    background-image: image-url("wittle_expert.png");
     background-size: cover;
     display: block;
     width: 215px;