summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--css/sally.css8
-rw-r--r--index.html2
-rw-r--r--js/clipboard.js2
-rw-r--r--js/ui/controls.js10
-rw-r--r--simi.html1
5 files changed, 13 insertions, 10 deletions
diff --git a/css/sally.css b/css/sally.css
index 044c394..73857cb 100644
--- a/css/sally.css
+++ b/css/sally.css
@@ -75,10 +75,10 @@ a:hover { text-decoration: underline }
}
}
span,a { min-width: 8px; line-height: 15px; display: inline-block; }
-.square #brush_rapper span,
-.square #brush_rapper a,
-.square #canvas_rapper span,
-.square #canvas_rapper a { line-height: 8px; overflow: hidden; }
+.pixels #brush_rapper span,
+.pixels #brush_rapper a,
+.pixels #canvas_rapper span,
+.pixels #canvas_rapper a { line-height: 8px; overflow: hidden; }
.rapper { cursor: crosshair; }
body.grid span { border-right: 1px solid #444; border-bottom: 1px solid #444; }
body.grid div { border-left: 1px solid #444; }
diff --git a/index.html b/index.html
index 7bf9567..a7d3e1e 100644
--- a/index.html
+++ b/index.html
@@ -48,7 +48,7 @@
<span id="grid_el" class="tool">_ grid</span><br>
<span id="rotate_checkbox" class="tool">_ rotate</span><br>
<span id="vertical_checkbox" class="tool">_ vertical</span><br>
- <span id="square_checkbox" class="tool">_ square</span><br>
+ <span id="pixels_checkbox" class="tool">_ pixels</span><br>
<br>
brush size: <span id="brush_w_el" class="ed">5</span> x <span id="brush_h_el" class="ed">5</span><br>
canvas size: <span id="canvas_w_el" class="ed">100</span> x <span id="canvas_h_el" class="ed">30</span><br>
diff --git a/js/clipboard.js b/js/clipboard.js
index 5d81f00..ecb200b 100644
--- a/js/clipboard.js
+++ b/js/clipboard.js
@@ -202,7 +202,7 @@ var clipboard = (function () {
export_canvas: function (done_fn) {
var opts = {
palette: 'mirc',
- font: canvas.square ? 'fixedsys_8x8' : 'fixedsys_8x15',
+ font: canvas.pixels ? 'fixedsys_8x8' : 'fixedsys_8x15',
fg: 0,
bg: 1,
canvas: clipboard.canvas
diff --git a/js/ui/controls.js b/js/ui/controls.js
index 8a20a2e..06cd171 100644
--- a/js/ui/controls.js
+++ b/js/ui/controls.js
@@ -230,10 +230,12 @@ var controls = (function(){
this.update(canvas.rotated)
}
- controls.square = new BlurredCheckbox (square_checkbox)
- controls.square.use = function(state){
- canvas.square = typeof state == "boolean" ? state : ! canvas.square
- document.body.classList.toggle("square", canvas.square)
+ controls.pixels = new BlurredCheckbox (pixels_checkbox)
+ controls.pixels.memorable = true
+ controls.pixels.use = function(state){
+ canvas.pixels = typeof state == "boolean" ? state : ! canvas.pixels
+ document.body.classList.toggle("pixels", canvas.pixels)
+ this.update(canvas.pixels)
}
//
diff --git a/simi.html b/simi.html
index 2606cd9..2eec46a 100644
--- a/simi.html
+++ b/simi.html
@@ -54,6 +54,7 @@
<span id="grid_el" class="tool">_ grid</span><br>
<span id="rotate_checkbox" class="tool">_ rotate</span><br>
<span id="vertical_checkbox" class="tool">_ vertical</span><br>
+ <span id="pixels_checkbox" class="tool">_ pixels</span><br>
<br>
brush size: <span id="brush_w_el" class="ed">5</span> x <span id="brush_h_el" class="ed">5</span><br>
canvas size: <span id="canvas_w_el" class="ed">100</span> x <span id="canvas_h_el" class="ed">30</span><br>