Move receiver and rssi configuration to receiver tab

betaflight · Feb 17, 2021 · a4ba1ad · a4ba1ad
1 parent 168e778
commit a4ba1ad
Show file tree

Hide file tree

Showing 7 changed files with 445 additions and 432 deletions.
diff --git a/src/css/dark-theme.css b/src/css/dark-theme.css
@@ -718,6 +718,11 @@ progress[value]::-webkit-progress-bar {
 
 /* RECEIVER TAB */
 
+.tab-receiver .gui_box span {
+    color: white;
+}
+
+.tab-receiver input,
 .tab-receiver select {
     background-color: #3a3a3a;
     color: white;

diff --git a/src/css/tabs/configuration.css b/src/css/tabs/configuration.css
@@ -201,13 +201,7 @@
     float: left;
 }
 
-.tab-configuration .rssi td {
-    border-bottom: none;
-    padding-bottom: 0;
-    margin-bottom: 0;
-}
-
-.tab-configuration .rssi .gui_box, .tab-configuration .system .gui_box {
+.tab-configuration .tab-configuration .system .gui_box {
     float: left;
 }
 
@@ -220,27 +214,6 @@
     margin-bottom: 10px;
 }
 
-.tab-configuration .current .gui_box {
-    float: left;
-}
-
-.tab-configuration .current td:nth-child(2) {
-    width: 30px;
-}
-
-.tab-configuration .rssi td:nth-child(2) {
-    width: 30px;
-}
-
-.tab-configuration .rxFailsafe td:nth-child(2) {
-    width: 30px;
-}
-
-.tab-configuration .serialRXBox, .spiRxBox {
-    padding-top: 0;
-}
-
-
 .tab-configuration .gps td:nth-child(2) {
     width: 38px;
 }
@@ -336,7 +309,7 @@
     .tab-configuration .gui_box span {
         line-height: 17px;
     }
-    .tab-configuration .rssi .gui_box, .tab-configuration .system .gui_box {
+    .tab-configuration .system .gui_box {
         float: left;
     }
     .tab-configuration .board .gui_box, .tab-configuration .acc .gui_box {
@@ -345,30 +318,15 @@
     .tab-configuration .gps .gui_box, .tab-configuration .other .gui_box {
         float: left;
     }
-    .tab-configuration .current .gui_box {
-        float: left;
-    }
 }
 @media all and (max-width: 575px) {
-    .tab-configuration .rssi .gui_box, .tab-configuration .system .gui_box {
+    .tab-configuration .system .gui_box {
         min-height: auto;
     }
-    .tab-configuration .current td:nth-child(2) {
-        width: auto;
-    }
-    .tab-configuration .voltage td:nth-child(2) {
-        width: auto;
-    }
-    .tab-configuration .rssi td:nth-child(2) {
-        width: auto;
-    }
-    .tab-configuration .rxFailsafe td:nth-child(2) {
-        width: auto;
-    }
     .tab-configuration .gps td:nth-child(2) {
         width: auto;
     }
-    select.features.rxMode, select.serialRX, .dshotbeacon > td > div.select > div, .dshotbeacon select.dshotBeeperBeaconTone {
+    .dshotbeacon > td > div.select > div, .dshotbeacon select.dshotBeeperBeaconTone {
         width: 100%;
     }
 }
diff --git a/src/css/tabs/receiver.css b/src/css/tabs/receiver.css
@@ -577,3 +577,149 @@
         display: inherit;
     }
 }
+
+
+/* rx configuration */
+
+.tab-receiver .rssi input,
+.tab-receiver .receiver select {
+    border: 1px solid var(--subtleAccent);
+    width: 230px;
+    height: 20px;
+    float: left;
+    margin-right: 15px;
+    border-radius: 3px;
+}
+
+.tab-receiver table {
+    margin-bottom: 0;
+    width: 100%;
+    float: left;
+}
+
+.tab-receiver table, .tab-receiver table th, .tab-receiver table td {
+    padding: 0;
+    text-align: left;
+}
+
+.tab-receiver table th {
+    padding: 3px;
+    border-bottom: 1px solid var(--subtleAccent);
+}
+
+.tab-receiver table td {
+    border-bottom: 1px solid var(--subtleAccent);
+}
+
+.tab-receiver table tr td:first-child {
+    text-align: left;
+    width: 55px;
+}
+
+.tab-receiver table thead tr:first-child {
+    background-color: #ececec;
+}
+
+.tab-receiver dl.features dt {
+    float: left;
+    width: 10px;
+    height: 18px;
+    line-height: 18px;
+}
+
+.tab-receiver dl.features dt input {
+    margin-top: 2px;
+}
+
+.tab-receiver dl.features dd {
+    margin: 0 0 0 20px;
+    height: 18px;
+    line-height: 18px;
+}
+
+.tab-receiver span {
+    margin: 0;
+}
+
+.tab-receiver .spacer_box {
+    padding-bottom: 10px;
+    float: left;
+    width: calc(100% - 20px);
+}
+
+.tab-receiver .select
+{
+    margin-bottom: 5px;
+    clear: left;
+    padding-bottom: 5px;
+    border-bottom: 1px solid var(--subtleAccent);
+    width: 100%;
+    float: left;
+}
+
+.tab-receiver .select:last-child {
+    border-bottom: none;
+    padding-bottom: 0;
+    margin-bottom: 0;
+}
+
+.tab-receiver .gui_box_titlebar {
+    margin-bottom: 0;
+}
+
+.tab-receiver .rssi thead {
+    display: none;
+}
+
+.tab-receiver .gui_box {
+    margin-bottom: 10px;
+    float: left;
+    font-weight: bold;
+}
+
+.tab-receiver .rssi td {
+    border-bottom: none;
+    padding-bottom: 0;
+    margin-bottom: 0;
+}
+
+.tab-receiver .rssi .gui_box {
+    float: left;
+}
+
+.tab-receiver .rssi td:nth-child(2) {
+    width: 20px;
+}
+
+.tab-receiver .serialRXBox, .spiRxBox {
+    padding-top: 0;
+}
+
+.tab-receiver .gui_box span {
+    font-style: normal;
+    font-weight: normal;
+    line-height: 19px;
+    color: #4f4f4f;
+    font-size: 11px;
+}
+
+@media only screen and (max-width: 1055px) , only screen and (max-device-width: 1055px) {
+    .tab-receiver .gui_box span {
+        line-height: 17px;
+    }
+    .tab-receiver .rssi .gui_box {
+        float: left;
+    }
+}
+
+@media all and (max-width: 575px) {
+    .tab-receiver .rssi .gui_box {
+        min-height: auto;
+    }
+    .tab-receiver .rssi td:nth-child(2) {
+        width: auto;
+    }
+    .tab-receiver .features.rxMode, .tab-receiver .serialRX {
+        width: 100%;
+    }
+}