From 5c5fb26aad4a2fadd42f742021c5ab981c2b7b23 Mon Sep 17 00:00:00 2001 From: bradnon Date: Sun, 15 Mar 2015 02:09:08 -0400 Subject: [PATCH 1/2] Use real colors for the color buttons on the LED strip configuration tab --- tabs/led_strip.css | 27 +++++++++++++++++++++++++-- tabs/led_strip.html | 32 ++++++++++++++++---------------- 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/tabs/led_strip.css b/tabs/led_strip.css index cbf16cae..16500385 100644 --- a/tabs/led_strip.css +++ b/tabs/led_strip.css @@ -144,7 +144,7 @@ margin: 3px 0; } -.tab-led-strip button:hover { +.tab-led-strip .not(colors) button:hover { background-color: #acacac; } @@ -170,7 +170,30 @@ .tab-led-strip .functions .function-c.btnOn { background: linear-gradient( to bottom right, rgba(255, 0, 0, .5) 0%, rgba(255, 255, 0, 0.5) 15%, rgba(0, 255, 0, .5) 30%, rgba(0, 255, 255, .5) 50%, rgba(0, 0, 255, .5) 65%, rgba(255, 0, 255, .5) 80%, rgba(255, 0, 0, .5) 100%); } -.tab-led-strip .colors .btnOn, + +.tab-led-strip .color-0 {background: black; color: white;} +.tab-led-strip .color-1 {background: white; color: black;} +.tab-led-strip .color-2 {background: red; color: white;} +.tab-led-strip .color-3 {background: orange; color: black;} +.tab-led-strip .color-4 {background: yellow; color: black;} +.tab-led-strip .color-5 {background: lime; color: black;} +.tab-led-strip .color-6 {background: green; color: white;} +.tab-led-strip .color-7 {background: palegreen; color: black;} +.tab-led-strip .color-8 {background: cyan; color: white;} +.tab-led-strip .color-9 {background: lightcyan; color: black;} +.tab-led-strip .color-10 {background: blue; color: white;} +.tab-led-strip .color-11 {background: darkviolet; color: white;} +.tab-led-strip .color-12 {background: magenta; color: white;} +.tab-led-strip .color-13 {background: deeppink; color: white;} +.tab-led-strip .color-14 {background: black; color: white;} +.tab-led-strip .color-15 {background: black; color: white;} + +.tab-led-strip .colors .btnOn {box-shadow: brown 2px 3px 3px;} +.tab-led-strip .colors button:hover { + border-color: inherit; + border-style: solid; +} + .tab-led-strip .directions .btnOn {background: #FFF; color: #000;} .tab-led-strip .indicators { diff --git a/tabs/led_strip.html b/tabs/led_strip.html index dac944aa..cac4d579 100644 --- a/tabs/led_strip.html +++ b/tabs/led_strip.html @@ -48,22 +48,22 @@
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
From cb3b2f54fb230f047bce45e8072c0aa46f09319b Mon Sep 17 00:00:00 2001 From: bradnon Date: Sun, 15 Mar 2015 18:03:30 -0400 Subject: [PATCH 2/2] Updated without .not() and black text friendly --- tabs/led_strip.css | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tabs/led_strip.css b/tabs/led_strip.css index 16500385..94bc443a 100644 --- a/tabs/led_strip.css +++ b/tabs/led_strip.css @@ -144,7 +144,7 @@ margin: 3px 0; } -.tab-led-strip .not(colors) button:hover { +.tab-led-strip button:hover { background-color: #acacac; } @@ -171,24 +171,24 @@ background: linear-gradient( to bottom right, rgba(255, 0, 0, .5) 0%, rgba(255, 255, 0, 0.5) 15%, rgba(0, 255, 0, .5) 30%, rgba(0, 255, 255, .5) 50%, rgba(0, 0, 255, .5) 65%, rgba(255, 0, 255, .5) 80%, rgba(255, 0, 0, .5) 100%); } -.tab-led-strip .color-0 {background: black; color: white;} -.tab-led-strip .color-1 {background: white; color: black;} -.tab-led-strip .color-2 {background: red; color: white;} -.tab-led-strip .color-3 {background: orange; color: black;} -.tab-led-strip .color-4 {background: yellow; color: black;} -.tab-led-strip .color-5 {background: lime; color: black;} -.tab-led-strip .color-6 {background: green; color: white;} -.tab-led-strip .color-7 {background: palegreen; color: black;} -.tab-led-strip .color-8 {background: cyan; color: white;} -.tab-led-strip .color-9 {background: lightcyan; color: black;} -.tab-led-strip .color-10 {background: blue; color: white;} -.tab-led-strip .color-11 {background: darkviolet; color: white;} -.tab-led-strip .color-12 {background: magenta; color: white;} -.tab-led-strip .color-13 {background: deeppink; color: white;} -.tab-led-strip .color-14 {background: black; color: white;} -.tab-led-strip .color-15 {background: black; color: white;} +.tab-led-strip .color-0 {} +.tab-led-strip .color-1 {background: white;} +.tab-led-strip .color-2 {background: red;} +.tab-led-strip .color-3 {background: orange;} +.tab-led-strip .color-4 {background: yellow;} +.tab-led-strip .color-5 {background: greenyellow;} +.tab-led-strip .color-6 {background: limegreen;} +.tab-led-strip .color-7 {background: palegreen;} +.tab-led-strip .color-8 {background: cyan;} +.tab-led-strip .color-9 {background: lightcyan;} +.tab-led-strip .color-10 {background: dodgerblue;} +.tab-led-strip .color-11 {background: darkviolet;} +.tab-led-strip .color-12 {background: magenta;} +.tab-led-strip .color-13 {background: deeppink;} +.tab-led-strip .color-14 {} +.tab-led-strip .color-15 {} -.tab-led-strip .colors .btnOn {box-shadow: brown 2px 3px 3px;} +.tab-led-strip .colors .btnOn {box-shadow: dimgray -1px -2px 3px;} .tab-led-strip .colors button:hover { border-color: inherit; border-style: solid;