From 29ce2eae6048274f636140c05980ad4c24a032f5 Mon Sep 17 00:00:00 2001
From: Kyle K
Date: Fri, 28 Jun 2019 20:06:02 +0000
Subject: [PATCH] further tweaks to dark mode
---
src/css/main-dark.css | 14 +++-
src/css/main.css | 8 ++
src/css/tabs-dark/adjustments-dark.css | 1 +
src/css/tabs-dark/auxiliary-dark.css | 2 +-
src/css/tabs-dark/failsafe-dark.css | 13 ++++
src/css/tabs-dark/firmware_flasher-dark.css | 4 +
src/css/tabs/firmware_flasher.css | 4 -
src/css/tabs/osd.css | 5 --
.../icons/cf_failsafe_procedure1-dark.svg | 49 ++++++++++++
.../icons/cf_failsafe_procedure2-dark.svg | 53 +++++++++++++
.../icons/cf_failsafe_procedure4-dark.svg | 78 +++++++++++++++++++
src/images/icons/cf_icon_info_white.svg | 47 +++++++++++
src/tabs/firmware_flasher.html | 8 +-
13 files changed, 271 insertions(+), 15 deletions(-)
create mode 100644 src/images/icons/cf_failsafe_procedure1-dark.svg
create mode 100644 src/images/icons/cf_failsafe_procedure2-dark.svg
create mode 100644 src/images/icons/cf_failsafe_procedure4-dark.svg
create mode 100644 src/images/icons/cf_icon_info_white.svg
diff --git a/src/css/main-dark.css b/src/css/main-dark.css
index 1b11e33f74..e45e158b90 100644
--- a/src/css/main-dark.css
+++ b/src/css/main-dark.css
@@ -105,4 +105,16 @@ dialog {
button {
border: 1px solid #ffbb2a;
-}
\ No newline at end of file
+}
+
+.helpicon {
+ background-image: url(../images/icons/cf_icon_info_white.svg);
+ opacity: 0.3;
+}
+.gui_box_titlebar .helpicon {
+ background-image: url(../images/icons/cf_icon_info_grey.svg);
+}
+
+.noUi-pips {
+ color: #dbdbdb;
+}
diff --git a/src/css/main.css b/src/css/main.css
index e57795f9b3..ffc3dadc39 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -1229,6 +1229,7 @@ dialog {
rgba(255, 255, 255, .3) 60%, rgba(255, 255, 255, .3) 70%, transparent 70%, transparent 80%,
rgba(255, 255, 255, .3) 80%, rgba(255, 255, 255, .3) 90%, transparent 90%, transparent 100%,
rgba(255, 255, 255, .4) 100%, transparent);
+ color: white;
}
.gui_note .gui_box_titlebar {
@@ -1239,6 +1240,7 @@ dialog {
rgba(255, 255, 255, .3) 60%, rgba(255, 255, 255, .3) 70%, transparent 70%, transparent 80%,
rgba(255, 255, 255, .3) 80%, rgba(255, 255, 255, .3) 90%, transparent 90%, transparent 100%,
rgba(255, 255, 255, .4) 100%, transparent);
+ color: white;
}
@@ -2042,3 +2044,9 @@ input {
}
}
+
+.darkgrey_box {
+ background-color: #575757;
+ color: white;
+}
+
diff --git a/src/css/tabs-dark/adjustments-dark.css b/src/css/tabs-dark/adjustments-dark.css
index 0f97222175..09c2bdea08 100644
--- a/src/css/tabs-dark/adjustments-dark.css
+++ b/src/css/tabs-dark/adjustments-dark.css
@@ -20,3 +20,4 @@
.tab-adjustments .noUi-background {
background-color: #858585;
}
+
diff --git a/src/css/tabs-dark/auxiliary-dark.css b/src/css/tabs-dark/auxiliary-dark.css
index ed69ad8844..dd0c7ad7d5 100644
--- a/src/css/tabs-dark/auxiliary-dark.css
+++ b/src/css/tabs-dark/auxiliary-dark.css
@@ -24,7 +24,7 @@
background-color: #484848;
}
-.tab-auxiliary .range .channel {
+.tab-auxiliary .range .channel,.logic,.linkedTo {
border: 1px solid #9c9c9c;
background-color: #3a3a3a;
color: white;
diff --git a/src/css/tabs-dark/failsafe-dark.css b/src/css/tabs-dark/failsafe-dark.css
index cc22b4b4f6..f0bd81806b 100644
--- a/src/css/tabs-dark/failsafe-dark.css
+++ b/src/css/tabs-dark/failsafe-dark.css
@@ -45,3 +45,16 @@
background-color: #3a3a3a;
color: white;
}
+
+.tab-failsafe .pro1 {
+ background-image: url(../../images/icons/cf_failsafe_procedure1-dark.svg);
+}
+
+.tab-failsafe .pro2 {
+ background-image: url(../../images/icons/cf_failsafe_procedure2-dark.svg);
+}
+
+.tab-failsafe .pro4 {
+ background-image: url(../../images/icons/cf_failsafe_procedure4-dark.svg);
+}
+
diff --git a/src/css/tabs-dark/firmware_flasher-dark.css b/src/css/tabs-dark/firmware_flasher-dark.css
index 519e69bce8..501c54449e 100644
--- a/src/css/tabs-dark/firmware_flasher-dark.css
+++ b/src/css/tabs-dark/firmware_flasher-dark.css
@@ -32,3 +32,7 @@
.btn .disabled {
background-color: #393b3a;
}
+
+.gui_note .gui_box_titlebar {
+ color: black;
+}
diff --git a/src/css/tabs/firmware_flasher.css b/src/css/tabs/firmware_flasher.css
index 0569f5d40f..687cbc62aa 100644
--- a/src/css/tabs/firmware_flasher.css
+++ b/src/css/tabs/firmware_flasher.css
@@ -18,10 +18,6 @@
/* text-shadow: 1px 0px 2px rgba(0, 0, 0, 0.9);*/
}
-.darkgrey {
- background-color: #575757;
-}
-
.tab-firmware_flasher .spacer_box_title {
float: none;
}
diff --git a/src/css/tabs/osd.css b/src/css/tabs/osd.css
index 59564919e1..1f38c0753f 100644
--- a/src/css/tabs/osd.css
+++ b/src/css/tabs/osd.css
@@ -17,11 +17,6 @@
/* text-shadow: 1px 0px 2px rgba(0, 0, 0, 0.9);*/
}
-
-.darkgrey {
- background-color: #575757;
-}
-
.tab-osd .spacer_box_title {
float: none;
}
diff --git a/src/images/icons/cf_failsafe_procedure1-dark.svg b/src/images/icons/cf_failsafe_procedure1-dark.svg
new file mode 100644
index 0000000000..28ec922c3d
--- /dev/null
+++ b/src/images/icons/cf_failsafe_procedure1-dark.svg
@@ -0,0 +1,49 @@
+
+
+
diff --git a/src/images/icons/cf_failsafe_procedure2-dark.svg b/src/images/icons/cf_failsafe_procedure2-dark.svg
new file mode 100644
index 0000000000..5e028567a2
--- /dev/null
+++ b/src/images/icons/cf_failsafe_procedure2-dark.svg
@@ -0,0 +1,53 @@
+
+
+
diff --git a/src/images/icons/cf_failsafe_procedure4-dark.svg b/src/images/icons/cf_failsafe_procedure4-dark.svg
new file mode 100644
index 0000000000..dc34276c71
--- /dev/null
+++ b/src/images/icons/cf_failsafe_procedure4-dark.svg
@@ -0,0 +1,78 @@
+
+
+
diff --git a/src/images/icons/cf_icon_info_white.svg b/src/images/icons/cf_icon_info_white.svg
new file mode 100644
index 0000000000..87e3c01efb
--- /dev/null
+++ b/src/images/icons/cf_icon_info_white.svg
@@ -0,0 +1,47 @@
+
+
+
diff --git a/src/tabs/firmware_flasher.html b/src/tabs/firmware_flasher.html
index 57f98421e7..f1b0f5d46d 100644
--- a/src/tabs/firmware_flasher.html
+++ b/src/tabs/firmware_flasher.html
@@ -83,8 +83,8 @@