1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-18 05:45:31 +03:00

Merge branch 'led-strip' of

https://github.com/decompyler/cleanflight-configurator into
decompyler-led-strip

Conflicts:
	tabs/led_strip.css
	tabs/led_strip.js
This commit is contained in:
Dominic Clifton 2015-01-09 01:17:57 +00:00
commit db68d567d3

View file

@ -20,12 +20,12 @@
.tab-led-strip .mainGrid .gPoint { .tab-led-strip .mainGrid .gPoint {
float: left; float: left;
border: solid 2px #000; border: solid 2px #ADADAD;
width: 28px; width: 28px;
height: 28px; height: 28px;
margin: 3px; margin: 3px;
border-radius: 7px; border-radius: 7px;
background: rgba(0,0,0,.3); background: #ececec;;
cursor: pointer; cursor: pointer;
} }
@ -52,9 +52,9 @@
} }
.tab-led-strip .gPoint.mode-a { /* Armed Mode */ .tab-led-strip .gPoint.mode-a { /* Armed Mode */
background: blue; background: rgb(52, 155, 255);
box-shadow: inset 0 0 30px rgba(0, 0, 0, .7); box-shadow: inset 0 0 30px rgba(0, 0, 0, .7);
border-color: blue; border-color: rgb(52, 155, 255);
} }
.tab-led-strip .gPoint.mode-t { /* Armed Mode */ .tab-led-strip .gPoint.mode-t { /* Armed Mode */
@ -99,7 +99,7 @@
} }
.gridWire .gPoint { .gridWire .gPoint {
background: #333 !important; background: #CAFFCD !important;
} }
/*function buttons*/ /*function buttons*/
@ -226,6 +226,7 @@
width: 100%; width: 100%;
height: 160px; height: 160px;
} }
.tab-led-strip .tempOutput { .tab-led-strip .tempOutput {
color: #fff; color: #fff;
background: rgba(0,0,0,.2); background: rgba(0,0,0,.2);
@ -257,7 +258,6 @@
float: right; float: right;
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
} }
.tab-led-strip .wires-remaining div { .tab-led-strip .wires-remaining div {
@ -280,7 +280,7 @@
.tab-led-strip .ui-selecting { .tab-led-strip .ui-selecting {
box-shadow: inset 0 0 30px rgba(255, 255, 255, .7) !important; box-shadow: inset 0 0 30px rgba(255, 255, 255, .7) !important;
border: solid 2px #c0c0c0 !important; border: solid 2px #000 !important;
} }
.tab-led-strip .ui-selectable-helper { .tab-led-strip .ui-selectable-helper {