From 9ff87fbff2f89ab64f22d30b35bfb691d8e513de Mon Sep 17 00:00:00 2001 From: Julie Lala Date: Tue, 2 Dec 2014 02:05:45 -0500 Subject: add alt color cycle --- colors.html | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ css/sally.css | 16 +++++++++++ index.html | 17 ----------- js/color.js | 10 ++++--- 4 files changed, 114 insertions(+), 21 deletions(-) create mode 100644 colors.html diff --git a/colors.html b/colors.html new file mode 100644 index 0000000..f5f9381 --- /dev/null +++ b/colors.html @@ -0,0 +1,92 @@ + + + + +
+ +
+
+ + + + + + + + \ No newline at end of file diff --git a/css/sally.css b/css/sally.css index 71029f8..61f544e 100644 --- a/css/sally.css +++ b/css/sally.css @@ -46,6 +46,22 @@ a:link, a:visited {text-decoration: none; color: #3b3740} .tool { cursor: pointer; } +.rapper { cursor: crosshair; } +body.grid span { border-right: 1px solid #444; border-top: 1px solid #444; border-bottom: 1px solid #444; } +body.grid div { border-top: 1px solid #444; border-left: 1px solid #444; } +.ed { color: #fff; } +.focused { box-shadow: inset 0 0px 3px #fff; border-color: #fff; } +.tool.focused, .ed.focused { color: white; text-decoration: underline; } +body.loading { opacity: 0; } +body { transition: 0.1s linear; } +.focused { box-shadow: inset 1px 0 2px white, inset -1px 0 2px white, inset 0 1px 2px white, inset 0 -1px 2px white; } +#shader_textarea { display: none; } +#import_textarea { font-size: 9pt; } +textarea { font-size:12pt; width: 45%; height: 300px; background: #333; color: #0f0; border: 0; font-family: 'FixedsysExcelsior301Regular'; outline: 0; border: 1px solid #333; background:#010;} +#import_rapper { display: none; } +#cursor_input { position: absolute; top: 0; right: 0; width:30px; opacity: 0; } + + @media screen and (-webkit-min-device-pixel-ratio:0) { #nvgovy{white-space:pre;} } diff --git a/index.html b/index.html index cd33925..108a2c3 100644 --- a/index.html +++ b/index.html @@ -1,22 +1,5 @@ - diff --git a/js/color.js b/js/color.js index 42ae6b0..738ad02 100644 --- a/js/color.js +++ b/js/color.js @@ -1,13 +1,14 @@ var color_names = ("white black dark-blue green red dark-red purple orange " + "yellow lime dark-cyan cyan blue magenta dark-gray light-gray").split(" "); -var color_hue_order = ("black dark-blue purple dark-red red orange " + - "yellow lime green dark-cyan cyan blue magenta dark-gray light-gray white").split(" "); +var all_color_hue_order = ("black dark-blue purple dark-red red orange " + + "yellow lime green dark-cyan cyan blue magenta dark-gray light-gray white").split(" "); +var color_hue_order = "dark-red red orange yellow lime cyan dark-cyan blue dark-blue purple magenta".split(" "); var gray_names = ("black dark-gray light-gray white").split(" ") var fire_names = ("black dark-red red orange yellow white cyan").split(" ") var red_names = ("black dark-red red").split(" ") -var yellow_names = ("orange yellow cyan white").split(" ") +var yellow_names = ("black orange yellow white").split(" ") var green_names = ("dark-cyan green lime").split(" ") var blue_names = ("black dark-blue blue").split(" ") var purple_names = ("dark-blue purple magenta red").split(" ") @@ -17,7 +18,8 @@ var colors = {} color_names.forEach(function(name, i){ colors[name] = i }) -function hue (n) { return colors[color_hue_order[mod(n, 16)|0]] } +function all_hue (n) { return colors[color_hue_order[mod(n, 16)|0]] } +function hue (n) { return colors[color_hue_order[mod(n, 11)|0]] } function gray (n) { return colors[gray_names[mod(n, 4)|0]] } function fire (n) { return colors[fire_names[mod(n, 7)|0]] } function red (n) { return colors[red_names[mod(n, 3)|0]] } -- cgit v1.2.3-70-g09d2