change ui

5 files changed, 10 insertions, 5 deletions

diff --git a/css/sally.css b/css/sally.css
index 00fdb4a..b831aff 100644
--- a/css/sally.css
+++ b/css/sally.css
@@ -122,7 +122,7 @@ textarea { font-size:12pt; width: 37vw; height: 300px; background: #333; color:
 #secret_rapper span { float: left; }
 .vertical #secret_rapper { margin-right: 10px; }
 .vertical #secret_rapper span { float: left; clear: both; }
-.nopaint #brush_rapper { min-height: 50px; min-width: 50px; }
+.nopaint #brush_rapper { min-height: 70px; min-width: 50px; }
 
 #nopaint_rapper.hidden {
   display: none;
diff --git a/index.html b/index.html
index f068683..2419110 100644
--- a/index.html
+++ b/index.html
@@ -14,7 +14,7 @@
       <div id="palette_rapper"></div>
       <div id="secret_rapper">
         <span id="experimental_palette_toggle">.</span>
-        <span id="nopaint_toggle">.</span>
+        <!-- <span id="nopaint_toggle">N</span> -->
       </div>
       <div id="letters_rapper"></div>
       <div id="custom_rapper"></div>
@@ -28,11 +28,11 @@
       <span id="char_checkbox" class="tool">x char</span><br>
       <br>
       <span id="add_custom_el" class="tool">+ add</span>
-      <div id="nopaint_rapper" class="hidden">
+      <div id="nopaint_rapper">
         <br>
         <span id="nopaint_no_el" class="tool">no</span><br>
         <span id="nopaint_paint_el" class="tool">paint</span><br>
-        <span id="nopaint_pause_el" class="tool">pause</span><br>
+        <span id="nopaint_pause_el" class="tool hidden">pause</span><br>
       </div>
     </div>
     <div id="tools_rapper" class="block">
diff --git a/js/tool.js b/js/tool.js
index 0ad23b9..23c96ae 100644
--- a/js/tool.js
+++ b/js/tool.js
@@ -162,6 +162,5 @@ var HiddenCheckbox = BlurredCheckbox.extend({
   update: function(state){
     this.el.innerHTML = state ? this.on : this.off
     if (this.memorable) { localStorage.setItem("ascii.tools." + this.name, !! state) }
-    console.trace()
   }
 })
diff --git a/js/ui/controls.js b/js/ui/controls.js
index 00cb14c..a2b0c7b 100644
--- a/js/ui/controls.js
+++ b/js/ui/controls.js
@@ -182,6 +182,7 @@ var controls = (function(){
     this.update(state)
   }
 
+/*
   controls.nopaint = new HiddenCheckbox (nopaint_toggle)
   controls.nopaint.memorable = true
   controls.nopaint.on = "N"
@@ -189,6 +190,7 @@ var controls = (function(){
     var state = nopaint.toggle(state)
     this.update(state)
   }
+*/
 
   //
   
diff --git a/js/ui/nopaint.js b/js/ui/nopaint.js
index d6b0004..e3fb03c 100644
--- a/js/ui/nopaint.js
+++ b/js/ui/nopaint.js
@@ -11,11 +11,13 @@ var nopaint = (function(){
   controls.paint = new Tool (nopaint_paint_el)
   controls.paint.use = function(state){
     nopaint.play()
+    nopaint_pause_el.classList.toggle("hidden", false)
   }
   
   controls.nopaint_pause = new Tool (nopaint_pause_el)
   controls.nopaint_pause.use = function(state){
     nopaint.pause()
+    nopaint_pause_el.classList.toggle("hidden", true)
   }
   
   // use own stepwise clock to drive tweens
@@ -33,6 +35,7 @@ var nopaint = (function(){
   nopaint.toggle = function(state){
     var state = typeof state == "boolean" ? state : nopaint_rapper.classList.contains("hidden")
     nopaint_rapper.classList.toggle("hidden", ! state)
+    nopaint_pause_el.classList.toggle("hidden", true)
     document.body.classList.toggle("nopaint", state)
     return state
   }
@@ -359,5 +362,6 @@ var nopaint = (function(){
   nopaint.add_tool( new StarsTool({ weight: 6 }) )
   nopaint.regenerate_weights()
 
+  nopaint.toggle(true)
   return nopaint
 })()