Merge branch 'stage-v1.3.0'

chharvey · Jan 11, 2017 · 115479d · 115479d
2 parents 8b567f3 + ab292f1
commit 115479d
Show file tree

Hide file tree

Showing 13 changed files with 94 additions and 34 deletions.
diff --git a/doc/accessibility.html b/doc/accessibility.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><title>Accessibility | lux-nox</title><meta charset="utf-8"><meta name="author" content="Chris Harvey"><meta name="description" content="Solarized and Lunaried colors for any project."><link rel="stylesheet" href="../node_modules/xmeter/xmeter.min.css"><link rel="stylesheet" href="../node_modules/bangs/bangs.min.css"><link rel="stylesheet" href="../lux-nox.min.css"><link rel="stylesheet" href="../doc/styles/doc.css"></head><body><main><header><h1>lux-nox &mdash; Accessibility</h1></header><section><h2>Table of Contrast Ratios</h2><table class="c-CrTable"><caption><p>A demonstration of background colors and foreground colors.
+<!DOCTYPE html><html lang="en"><head><title>Accessibility | lux-nox</title><meta charset="utf-8"><meta name="author" content="Chris Harvey"><meta name="description" content="Solarized and Lunaried colors for any project."><link rel="stylesheet" href="https://cdn.rawgit.com/chharvey/xmeter/v4.0.0/xmeter.min.css"><link rel="stylesheet" href="https://cdn.rawgit.com/chharvey/bangs/v0.8.0/bangs.min.css"><link rel="stylesheet" href="../lux-nox.min.css"><link rel="stylesheet" href="../doc/styles/doc.css"></head><body><main><header><h1>lux-nox &mdash; Accessibility</h1></header><section><h2>Table of Contrast Ratios</h2><table class="c-CrTable"><caption><p>A demonstration of background colors and foreground colors.
 For brevity, the only background colors are Bases 03, 02, 2, and 3; and
 the only foreground colors are Bases 01, 00, 0, and 1, along with all accent colors.
 <a href="#contrast-ratio-table">Contrast ratios</a> are shown in each cell.</p></caption><colgroup></colgroup><colgroup><col class="a-bc-s03"><col class="a-bc-s02"><col class="a-bc-s2"><col class="a-bc-s3"></colgroup><colgroup><col class="a-bc-l03"><col class="a-bc-l02"><col class="a-bc-l2"><col class="a-bc-l3"></colgroup><thead><tr><td></td><th scope="col">Solarized Base03</th><th scope="col">Solarized Base02</th><th scope="col">Solarized Base2</th><th scope="col">Solarized Base3</th><th scope="col">Lunarized Base03</th><th scope="col">Lunarized Base02</th><th scope="col">Lunarized Base2</th><th scope="col">Lunarized Base3</th></tr></thead><tbody><tr class="a-c-s01"><th scope="row">Solarized Base01</th><td data-rating='1'>2.79</td><td data-rating='1'>2.42</td><td data-rating='2'>4.39</td><td data-rating='3'>4.99</td><td data-rating='2'>3.24</td><td data-rating='1'>2.94</td><td data-rating='2'>3.89</td><td data-rating='2'>4.47</td></tr><tr class="a-c-s00"><th scope="row">Solarized Base00</th><td data-rating='2'>3.37</td><td data-rating='1'>2.92</td><td data-rating='2'>3.64</td><td data-rating='2'>4.13</td><td data-rating='2'>3.91</td><td data-rating='2'>3.55</td><td data-rating='2'>3.22</td><td data-rating='2'>3.7</td></tr><tr class="a-c-s0"><th scope="row">Solarized Base0</th><td data-rating='3'>4.75</td><td data-rating='2'>4.11</td><td data-rating='1'>2.58</td><td data-rating='1'>2.93</td><td data-rating='3'>5.51</td><td data-rating='3'>5</td><td data-rating='1'>2.29</td><td data-rating='1'>2.63</td></tr><tr class="a-c-s1"><th scope="row">Solarized Base1</th><td data-rating='3'>5.61</td><td data-rating='3'>4.86</td><td data-rating='1'>2.18</td><td data-rating='1'>2.48</td><td data-rating='3'>6.52</td><td data-rating='3'>5.91</td><td data-rating='1'>1.94</td><td data-rating='1'>2.22</td></tr><tr class="a-c-sr"><th scope="row">Solarized Red</th><td data-rating='2'>3.25</td><td data-rating='1'>2.81</td><td data-rating='2'>3.77</td><td data-rating='2'>4.29</td><td data-rating='2'>3.77</td><td data-rating='2'>3.42</td><td data-rating='2'>3.35</td><td data-rating='2'>3.84</td></tr><tr class="a-c-so"><th scope="row">Solarized Orange</th><td data-rating='2'>3.26</td><td data-rating='1'>2.82</td><td data-rating='2'>3.76</td><td data-rating='2'>4.27</td><td data-rating='2'>3.78</td><td data-rating='2'>3.43</td><td data-rating='2'>3.33</td><td data-rating='2'>3.83</td></tr><tr class="a-c-sy"><th scope="row">Solarized Yellow</th><td data-rating='3'>4.68</td><td data-rating='2'>4.05</td><td data-rating='1'>2.62</td><td data-rating='1'>2.98</td><td data-rating='3'>5.43</td><td data-rating='3'>4.93</td><td data-rating='1'>2.32</td><td data-rating='1'>2.67</td></tr><tr class="a-c-sg"><th scope="row">Solarized Green</th><td data-rating='3'>4.69</td><td data-rating='2'>4.06</td><td data-rating='1'>2.62</td><td data-rating='1'>2.97</td><td data-rating='3'>5.44</td><td data-rating='3'>4.94</td><td data-rating='1'>2.32</td><td data-rating='1'>2.66</td></tr><tr class="a-c-sc"><th scope="row">Solarized Cyan</th><td data-rating='3'>4.75</td><td data-rating='2'>4.12</td><td data-rating='1'>2.58</td><td data-rating='1'>2.93</td><td data-rating='3'>5.52</td><td data-rating='3'>5.01</td><td data-rating='1'>2.29</td><td data-rating='1'>2.62</td></tr><tr class="a-c-sb"><th scope="row">Solarized Blue</th><td data-rating='2'>4.08</td><td data-rating='2'>3.53</td><td data-rating='2'>3</td><td data-rating='2'>3.41</td><td data-rating='3'>4.74</td><td data-rating='2'>4.3</td><td data-rating='1'>2.66</td><td data-rating='2'>3.06</td></tr><tr class="a-c-sv"><th scope="row">Solarized Violet</th><td data-rating='2'>3.43</td><td data-rating='1'>2.97</td><td data-rating='2'>3.57</td><td data-rating='2'>4.06</td><td data-rating='2'>3.98</td><td data-rating='2'>3.61</td><td data-rating='2'>3.17</td><td data-rating='2'>3.64</td></tr><tr class="a-c-sm"><th scope="row">Solarized Magenta</th><td data-rating='2'>3.3</td><td data-rating='1'>2.86</td><td data-rating='2'>3.71</td><td data-rating='2'>4.21</td><td data-rating='2'>3.83</td><td data-rating='2'>3.48</td><td data-rating='2'>3.29</td><td data-rating='2'>3.78</td></tr></tbody><tbody><tr class="a-c-l01"><th scope="row">Lunarized Base01</th><td data-rating='1'>2.53</td><td data-rating='1'>2.19</td><td data-rating='3'>4.85</td><td data-rating='3'>5.51</td><td data-rating='1'>2.93</td><td data-rating='1'>2.66</td><td data-rating='2'>4.3</td><td data-rating='3'>4.94</td></tr><tr class="a-c-l00"><th scope="row">Lunarized Base00</th><td data-rating='2'>3.1</td><td data-rating='1'>2.69</td><td data-rating='2'>3.95</td><td data-rating='2'>4.49</td><td data-rating='2'>3.6</td><td data-rating='2'>3.27</td><td data-rating='2'>3.5</td><td data-rating='2'>4.02</td></tr><tr class="a-c-l0"><th scope="row">Lunarized Base0</th><td data-rating='2'>4.27</td><td data-rating='2'>3.7</td><td data-rating='1'>2.87</td><td data-rating='2'>3.26</td><td data-rating='3'>4.96</td><td data-rating='3'>4.5</td><td data-rating='1'>2.54</td><td data-rating='1'>2.92</td></tr><tr class="a-c-l1"><th scope="row">Lunarized Base1</th><td data-rating='3'>5.08</td><td data-rating='2'>4.4</td><td data-rating='1'>2.41</td><td data-rating='1'>2.74</td><td data-rating='3'>5.9</td><td data-rating='3'>5.35</td><td data-rating='1'>2.14</td><td data-rating='1'>2.45</td></tr><tr class="a-c-lc"><th scope="row">Lunarized Cyan</th><td data-rating='4'>7.66</td><td data-rating='3'>6.63</td><td data-rating='1'>1.6</td><td data-rating='1'>1.82</td><td data-rating='4'>8.89</td><td data-rating='4'>8.07</td><td data-rating='1'>1.42</td><td data-rating='1'>1.63</td></tr><tr class="a-c-lb"><th scope="row">Lunarized Blue</th><td data-rating='3'>6.33</td><td data-rating='3'>5.48</td><td data-rating='1'>1.94</td><td data-rating='1'>2.2</td><td data-rating='4'>7.35</td><td data-rating='3'>6.67</td><td data-rating='1'>1.72</td><td data-rating='1'>1.97</td></tr><tr class="a-c-li"><th scope="row">Lunarized Indigo</th><td data-rating='2'>3.81</td><td data-rating='2'>3.3</td><td data-rating='2'>3.22</td><td data-rating='2'>3.65</td><td data-rating='2'>4.42</td><td data-rating='2'>4.01</td><td data-rating='1'>2.85</td><td data-rating='2'>3.28</td></tr><tr class="a-c-lv"><th scope="row">Lunarized Violet</th><td data-rating='2'>3.7</td><td data-rating='2'>3.2</td><td data-rating='2'>3.31</td><td data-rating='2'>3.76</td><td data-rating='2'>4.29</td><td data-rating='2'>3.9</td><td data-rating='1'>2.94</td><td data-rating='2'>3.37</td></tr><tr class="a-c-lr"><th scope="row">Lunarized Red</th><td data-rating='2'>4.02</td><td data-rating='2'>3.48</td><td data-rating='2'>3.05</td><td data-rating='2'>3.46</td><td data-rating='3'>4.67</td><td data-rating='2'>4.24</td><td data-rating='1'>2.7</td><td data-rating='2'>3.1</td></tr><tr class="a-c-lo"><th scope="row">Lunarized Orange</th><td data-rating='3'>4.64</td><td data-rating='2'>4.02</td><td data-rating='1'>2.64</td><td data-rating='2'>3</td><td data-rating='3'>5.38</td><td data-rating='3'>4.88</td><td data-rating='1'>2.34</td><td data-rating='1'>2.69</td></tr><tr class="a-c-ly"><th scope="row">Lunarized Yellow</th><td data-rating='2'>4.41</td><td data-rating='2'>3.82</td><td data-rating='1'>2.78</td><td data-rating='2'>3.15</td><td data-rating='3'>5.12</td><td data-rating='3'>4.65</td><td data-rating='1'>2.46</td><td data-rating='1'>2.83</td></tr><tr class="a-c-lg"><th scope="row">Lunarized Green</th><td data-rating='3'>6.98</td><td data-rating='3'>6.04</td><td data-rating='1'>1.76</td><td data-rating='1'>2</td><td data-rating='4'>8.1</td><td data-rating='4'>7.35</td><td data-rating='1'>1.56</td><td data-rating='1'>1.79</td></tr></tbody></table><p>The <a href="use.html">Suggested Use</a> page demonstrates the most accessible contrast ratios.</p><table id="contrast-ratio-table" style="font-size: 0.75rem; line-height: 2;" class="-mh-a"><caption>A summary of <a href="http://leaverou.github.io/contrast-ratio/">contrast ratios</a>.<br><small><dfn>Large text</dfn> is defined as above 18pt (24px), or above 14pt (19px) and bold.</small></caption><thead><tr><th scope="col">Contrast Ratio</th><th scope="col">Level</th><th scope="col">Keyword</th><th scope="col">Description</th></tr></thead><tbody><tr><td>&#x005b;1, 3.0&#x0029;</td><td>1</td><td>bad.</td><td>Fails <a href="https://www.w3.org/TR/WCAG/#visual-audio-contrast">WCAG 2.0</a></td></tr><tr><td>&#x005b;3.0, 4.5&#x0029;</td><td>2</td><td>okay&hellip;</td><td>Passes AA level for large text</td></tr><tr><td>&#x005b;4.5, 7.0&#x0029;</td><td>3</td><td>good!</td><td>Passes AA level for any size text and AAA for large text</td></tr><tr><td>&#x005b;7.0, 21&#x005d;</td><td>4</td><td>great!!</td><td>Passes AAA level for any size text</td></tr></tbody></table></section></main><script src="//code.jquery.com/jquery-1.12.0.min.js"></script></body></html>
diff --git a/doc/sample.html b/doc/sample.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><title>Sample | lux-nox</title><meta charset="utf-8"><meta name="author" content="Chris Harvey"><meta name="description" content="Solarized and Lunaried colors for any project."><link rel="stylesheet" href="../node_modules/xmeter/xmeter.min.css"><link rel="stylesheet" href="../node_modules/bangs/bangs.min.css"><link rel="stylesheet" href="../lux-nox.min.css"><link rel="stylesheet" href="../doc/styles/doc.css"></head><body><main><header><h1>lux-nox &mdash; Sample</h1></header><form class="o-GridFlex"><fieldset class="o-GridFlex__Item -w-1o2"><legend>Preset Themes</legend><p>Preset <cite>Solarized</cite> themes were created by
+<!DOCTYPE html><html lang="en"><head><title>Sample | lux-nox</title><meta charset="utf-8"><meta name="author" content="Chris Harvey"><meta name="description" content="Solarized and Lunaried colors for any project."><link rel="stylesheet" href="https://cdn.rawgit.com/chharvey/xmeter/v4.0.0/xmeter.min.css"><link rel="stylesheet" href="https://cdn.rawgit.com/chharvey/bangs/v0.8.0/bangs.min.css"><link rel="stylesheet" href="../lux-nox.min.css"><link rel="stylesheet" href="../doc/styles/doc.css"></head><body><main><header><h1>lux-nox &mdash; Sample</h1></header><form class="o-GridFlex"><fieldset class="o-GridFlex__Item -w-1o2"><legend>Preset Themes</legend><p>Preset <cite>Solarized</cite> themes were created by
 <a href="http://ethanschoonover(class=color.c)om/solarized">Ethan Schoonover</a>;
 preset <cite>Lunarized</cite> themes were created by me.
 Read the <a href="../index.html">home page</a> for more information.</p><ul class="o-ListBare"><li><label><input style="margin-right: 0.5em;" type="radio" name="preset" value="solarized_dark">Solarized Dark</label></li><li><label><input style="margin-right: 0.5em;" type="radio" name="preset" value="solarized_light">Solarized Light</label></li><li><label><input style="margin-right: 0.5em;" type="radio" name="preset" value="lunarized_dark">Lunarized Dark</label></li><li><label><input style="margin-right: 0.5em;" type="radio" name="preset" value="lunarized_light">Lunarized Light</label></li></ul></fieldset><fieldset class="o-GridFlex__Item -w-1o2"><legend>Accessible-Friendly Themes</legend><p>Accessible-friendly themes choose foreground and accent colors based on their
@@ -32,6 +32,30 @@
 <span class="js-cmd">&lt;/script&gt;</span></pre></main><script src="//code.jquery.com/jquery-1.12.0.min.js"></script><script>var context = {"Solarized":{"dark":{"text":{"class":"a-c-s0","name":"Solarized Base0"},"emph":{"class":"a-c-s1","name":"Solarized Base1"},"deemph":{"class":"a-c-s01","name":"Solarized Base01"},"hilite":{"class":"a-bc-s02","name":"Solarized Base02"},"bg":{"class":"a-bc-s03","name":"Solarized Base03"}},"light":{"text":{"class":"a-c-s00","name":"Solarized Base00"},"emph":{"class":"a-c-s01","name":"Solarized Base01"},"deemph":{"class":"a-c-s1","name":"Solarized Base1"},"hilite":{"class":"a-bc-s2","name":"Solarized Base2"},"bg":{"class":"a-bc-s3","name":"Solarized Base3"}},"accent":{"ctl":{"class":"a-c-sr","name":"Solarized Red"},"opr":{"class":"a-c-so","name":"Solarized Orange"},"kwd":{"class":"a-c-sy","name":"Solarized Yellow"},"cst":{"class":"a-c-sg","name":"Solarized Green"},"str":{"class":"a-c-sc","name":"Solarized Cyan"},"cmd":{"class":"a-c-sb","name":"Solarized Blue"},"arg":{"class":"a-c-sv","name":"Solarized Violet"},"obj":{"class":"a-c-sm","name":"Solarized Magenta"}}},"Lunarized":{"dark":{"text":{"class":"a-c-l0","name":"Lunarized Base0"},"emph":{"class":"a-c-l1","name":"Lunarized Base1"},"deemph":{"class":"a-c-l01","name":"Lunarized Base01"},"hilite":{"class":"a-bc-l02","name":"Lunarized Base02"},"bg":{"class":"a-bc-l03","name":"Lunarized Base03"}},"light":{"text":{"class":"a-c-l00","name":"Lunarized Base00"},"emph":{"class":"a-c-l01","name":"Lunarized Base01"},"deemph":{"class":"a-c-l1","name":"Lunarized Base1"},"hilite":{"class":"a-bc-l2","name":"Lunarized Base2"},"bg":{"class":"a-bc-l3","name":"Lunarized Base3"}},"accent":{"ctl":{"class":"a-c-lr","name":"Lunarized Red"},"opr":{"class":"a-c-lo","name":"Lunarized Orange"},"kwd":{"class":"a-c-ly","name":"Lunarized Yellow"},"cst":{"class":"a-c-lg","name":"Lunarized Green"},"str":{"class":"a-c-lc","name":"Lunarized Cyan"},"cmd":{"class":"a-c-lb","name":"Lunarized Blue"},"arg":{"class":"a-c-li","name":"Lunarized Indigo"},"obj":{"class":"a-c-lv","name":"Lunarized Violet"}}}}
 var createTheme = function createTheme(settings) {
   var empty_color = { class: '' , name: '' }
+  var returned = { settings : settings }
+  if (settings.fg_scheme && settings.mode) {
+    returned.text   = context[settings.fg_scheme][settings.mode].text
+    returned.emph   = context[settings.fg_scheme][settings.mode].emph
+    returned.deemph = context[settings.fg_scheme][settings.mode].deemph
+    returned.hilite = context[settings.bg_scheme][settings.mode].hilite
+    returned.bg     = context[settings.bg_scheme][settings.mode].bg
+  } else {
+    returned.text = returned.emph = returned.deemph = returned.hilite = returned.bg = empty_color
+  }
+  if (settings.ac_scheme) {
+    returned.ctl = context[settings.ac_scheme].accent.ctl
+    returned.opr = context[settings.ac_scheme].accent.opr
+    returned.kwd = context[settings.ac_scheme].accent.kwd
+    returned.cst = context[settings.ac_scheme].accent.cst
+    returned.str = context[settings.ac_scheme].accent.str
+    returned.cmd = context[settings.ac_scheme].accent.cmd
+    returned.arg = context[settings.ac_scheme].accent.arg
+    returned.obj = context[settings.ac_scheme].accent.obj
+  } else {
+    returned.ctl = returned.opr = returned.kwd = returned.cst = returned.str = returned.cmd = returned.arg = returned.obj = empty_color
+  }
+  return returned
+//-
   return {
     settings : settings
   , text   : (settings.fg_scheme && settings.mode) ? context[settings.fg_scheme][settings.mode].text   : empty_color

diff --git a/doc/scripts/color.js.jade b/doc/scripts/color.js.jade
@@ -216,7 +216,7 @@
       // achromatic (gray)
       red = grn = blu = val
     } else {
-      (function () {
+      ;(function () {
         var h = hue / 60 // sector 0 to 5
           , i = Math.floor(h)
           , f = h - i // factorial part of h

diff --git a/doc/scripts/lux-nox.js.jade b/doc/scripts/lux-nox.js.jade
@@ -107,13 +107,11 @@
     , cst: { color: 'green'   }
     , str: { color: 'cyan'    }
     , cmd: { color: 'blue'    }
-    , arg: { color: 'indigo'  , color_alt : 'violet' }
-    , obj: { color: 'magenta' , color_alt : 'violet' }
+    , arg: { color: 'indigo'  , color_alt: 'violet' }
+    , obj: { color: 'magenta' , color_alt: 'violet' }
     }
     for (var sch in scheme) {
-      context[sch] = {}
-      context[sch].dark = {}
-      context[sch].light = {}
+      context[sch] = { dark: {}, light: {} }
       for (var mod of ['dark','light']) {
         for (var comp in bases) {
           context[sch][mod][comp] = {
@@ -143,6 +141,30 @@
    */
   function createTheme(settings) {
     var empty_color = { class: '' , name: '' }
+    var returned = { settings : settings }
+    if (settings.fg_scheme && settings.mode) {
+      returned.text   = context[settings.fg_scheme][settings.mode].text
+      returned.emph   = context[settings.fg_scheme][settings.mode].emph
+      returned.deemph = context[settings.fg_scheme][settings.mode].deemph
+      returned.hilite = context[settings.bg_scheme][settings.mode].hilite
+      returned.bg     = context[settings.bg_scheme][settings.mode].bg
+    } else {
+      returned.text = returned.emph = returned.deemph = returned.hilite = returned.bg = empty_color
+    }
+    if (settings.ac_scheme) {
+      returned.ctl = context[settings.ac_scheme].accent.ctl
+      returned.opr = context[settings.ac_scheme].accent.opr
+      returned.kwd = context[settings.ac_scheme].accent.kwd
+      returned.cst = context[settings.ac_scheme].accent.cst
+      returned.str = context[settings.ac_scheme].accent.str
+      returned.cmd = context[settings.ac_scheme].accent.cmd
+      returned.arg = context[settings.ac_scheme].accent.arg
+      returned.obj = context[settings.ac_scheme].accent.obj
+    } else {
+      returned.ctl = returned.opr = returned.kwd = returned.cst = returned.str = returned.cmd = returned.arg = returned.obj = empty_color
+    }
+    return returned
+  //-
     return {
       settings : settings
     , text   : (settings.fg_scheme && settings.mode) ? context[settings.fg_scheme][settings.mode].text   : empty_color