From 4c138984904f035301d8443ce07939e169142ee4 Mon Sep 17 00:00:00 2001 From: Rick Fletcher Date: Mon, 12 Oct 2015 00:26:16 -0400 Subject: [PATCH 1/4] Make "skips" color consistent "Skips" were highlighted with orange on one page and yellow on another. This change makes them consistent, and switches the color to "black" for accessibility reasons. (The contrast between the shades of orange and red used for skips and errors was *very* low. Indistinguishable on some screens.) --- puppetboard/templates/index.html | 2 +- puppetboard/templates/nodes.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/puppetboard/templates/index.html b/puppetboard/templates/index.html index 599bde8..98e324c 100644 --- a/puppetboard/templates/index.html +++ b/puppetboard/templates/index.html @@ -93,7 +93,7 @@ {% else %} {% if node.events['failures'] %}{{node.events['failures']}}{% else %}0{% endif%} {% if node.events['successes'] %}{{node.events['successes']}}{% else %}0{% endif%} - {% if node.events['skips'] %}{{node.events['skips']}}{% else %}0{% endif%} + {% if node.events['skips'] %}{{node.events['skips']}}{% else %}0{% endif%} {% endif %} diff --git a/puppetboard/templates/nodes.html b/puppetboard/templates/nodes.html index c657706..68975d6 100644 --- a/puppetboard/templates/nodes.html +++ b/puppetboard/templates/nodes.html @@ -35,7 +35,7 @@ {% else %} {% if node.events['failures'] %}{{node.events['failures']}}{% else %}0{% endif%} {% if node.events['successes'] %}{{node.events['successes']}}{% else %}0{% endif%} - {% if node.events['skips'] %}{{node.events['skips']}}{% else %}0{% endif%} + {% if node.events['skips'] %}{{node.events['skips']}}{% else %}0{% endif%} {% endif %} {{node.name}} From f2da1b295a7514e0b34ef260f9a02778bdd72b82 Mon Sep 17 00:00:00 2001 From: Rick Fletcher Date: Mon, 12 Oct 2015 20:19:00 -0400 Subject: [PATCH 2/4] Define a "yellow" --- puppetboard/static/css/puppetboard.css | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/puppetboard/static/css/puppetboard.css b/puppetboard/static/css/puppetboard.css index 0e2444b..b2e4f0e 100644 --- a/puppetboard/static/css/puppetboard.css +++ b/puppetboard/static/css/puppetboard.css @@ -75,6 +75,23 @@ th.tablesorter-headerDesc::after { color: #FFF; } +.ui.menu.yellow { + background-color: #FFFF64; +} + +.ui.yellow.header, i.yellow { + color: #FFFF64; +} + +.ui.labels .yellow.label::before, .ui.yellow.labels .label::before, .ui.yellow.label::before { + background-color: #FFFF64; +} + +.ui.yellow.labels .label, .ui.yellow.label { + background-color: #FFFF64; + border-color: #FFFF64; +} + #scroll-btn-top { position: fixed; overflow: hidden; From 15a9aaaa9f49b94f73c74062ff7824a56b27d006 Mon Sep 17 00:00:00 2001 From: Rick Fletcher Date: Mon, 12 Oct 2015 20:20:49 -0400 Subject: [PATCH 3/4] Consistently use yellow for skip stats --- puppetboard/templates/index.html | 2 +- puppetboard/templates/nodes.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/puppetboard/templates/index.html b/puppetboard/templates/index.html index 98e324c..1c3e4b8 100644 --- a/puppetboard/templates/index.html +++ b/puppetboard/templates/index.html @@ -93,7 +93,7 @@ {% else %} {% if node.events['failures'] %}{{node.events['failures']}}{% else %}0{% endif%} {% if node.events['successes'] %}{{node.events['successes']}}{% else %}0{% endif%} - {% if node.events['skips'] %}{{node.events['skips']}}{% else %}0{% endif%} + {% if node.events['skips'] %}{{node.events['skips']}}{% else %}0{% endif%} {% endif %} diff --git a/puppetboard/templates/nodes.html b/puppetboard/templates/nodes.html index 68975d6..c657706 100644 --- a/puppetboard/templates/nodes.html +++ b/puppetboard/templates/nodes.html @@ -35,7 +35,7 @@ {% else %} {% if node.events['failures'] %}{{node.events['failures']}}{% else %}0{% endif%} {% if node.events['successes'] %}{{node.events['successes']}}{% else %}0{% endif%} - {% if node.events['skips'] %}{{node.events['skips']}}{% else %}0{% endif%} + {% if node.events['skips'] %}{{node.events['skips']}}{% else %}0{% endif%} {% endif %} {{node.name}} From 0c5914ff44a6cd6453840ec7457b561a5b76bee1 Mon Sep 17 00:00:00 2001 From: Rick Fletcher Date: Tue, 13 Oct 2015 12:05:46 -0400 Subject: [PATCH 4/4] Turn down brightness and saturation a bit in the predefined "yellow" --- puppetboard/static/css/puppetboard.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/puppetboard/static/css/puppetboard.css b/puppetboard/static/css/puppetboard.css index b2e4f0e..8c0faf7 100644 --- a/puppetboard/static/css/puppetboard.css +++ b/puppetboard/static/css/puppetboard.css @@ -76,20 +76,20 @@ th.tablesorter-headerDesc::after { } .ui.menu.yellow { - background-color: #FFFF64; + background-color: #F0E965; } .ui.yellow.header, i.yellow { - color: #FFFF64; + color: #F0E965; } .ui.labels .yellow.label::before, .ui.yellow.labels .label::before, .ui.yellow.label::before { - background-color: #FFFF64; + background-color: #F0E965; } .ui.yellow.labels .label, .ui.yellow.label { - background-color: #FFFF64; - border-color: #FFFF64; + background-color: #F0E965; + border-color: #F0E965; } #scroll-btn-top {