Skip to content

Commit 9442e9d

Browse files
authored
Clean up and improve receiver tab style (#1643)
Clean up and improve receiver tab style
2 parents 9350de3 + 3c8fc20 commit 9442e9d

File tree

4 files changed

+118
-100
lines changed

4 files changed

+118
-100
lines changed

src/css/tabs-dark/receiver-dark.css

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.tab-receiver select {
2-
background-color: #414443;
2+
background-color: #3a3a3a;
33
color: white;
44
}
55

@@ -31,15 +31,16 @@
3131
.tab-receiver .rssi_channel_wrapper {
3232
background-color: #414443;
3333
border-bottom: 1px solid #4d4d4d;
34+
border-right: 1px solid #4d4d4d;
3435
}
3536

3637
.tab-receiver .rcmap_wrapper {
3738
background-color: #414443;
39+
border-left: 1px solid #4d4d4d;
40+
border-bottom: 1px solid #4d4d4d;
3841
}
3942

4043
.tab-receiver .hybrid_element {
41-
border-bottom: 1px solid #4d4d4d;
42-
border-left: 1px solid #4d4d4d;
4344
border-top-left-radius: 5px;
4445
border-bottom-left-radius: 5px;
4546
}

src/css/tabs/receiver.css

Lines changed: 51 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,19 @@
136136
background-color: #14407a;
137137
}
138138

139+
.tab-receiver .fc_column {
140+
float: right;
141+
width: 50%;
142+
margin-left: 20px;
143+
}
144+
139145
.tab-receiver .tunings {
140146
float: right;
141147
position: relative;
142-
margin: 0px 0px 20px 0;
148+
margin: 0px 0px 10px 0;
143149
width: 100%;
144150
border-top-left-radius: 5px;
145151
border-bottom-left-radius: 5px;
146-
background-color: #DEDEDE;
147152
}
148153

149154
.tab-receiver .tunings .head {
@@ -185,15 +190,9 @@
185190
}
186191

187192
.tab-receiver .tunings table td {
188-
background: #DEDEDE;
189193
border-right: 1px solid var(--subtleAccent);
190194
}
191195

192-
.tab-receiver .smoothing table td {
193-
background: #DEDEDE;
194-
border-right: 0px;
195-
}
196-
197196
.tab-receiver .tunings table td:first-child {
198197
border-bottom-left-radius: 3px;
199198
}
@@ -207,38 +206,54 @@
207206
padding: 1px;
208207
}
209208

210-
.tab-receiver .tunings table tr:nth-child(odd) {
211-
background-color: #ececec;
212-
}
213-
214209
.tab-receiver .tunings table input {
215210
width: calc(100% - 8px);
216211
border: 1px solid var(--subtleAccent);
217212
border-radius: 3px;
218-
height: 20px;
219-
margin: 3px;
220-
line-height: 20px;
213+
height: 22px;
214+
margin: 4px;
215+
line-height: 22px;
221216
text-align: right;
217+
box-sizing: border-box;
218+
}
219+
220+
.tab-receiver .input-helpicon-flex {
221+
display: flex;
222+
flex-flow: row nowrap;
223+
}
224+
225+
.tab-receiver .input-helpicon-flex .helpicon {
226+
min-width: 14px;
227+
margin-left: 4px;
228+
}
229+
230+
.tab-receiver .tunings .sticks th,
231+
.tab-receiver .tunings .deadband th {
232+
width: 33%;
222233
}
223234

224235
.tab-receiver .rssi_channel_wrapper {
225236
float: right;
226-
margin: 0px 0px 20px 0;
237+
margin: 0px 0px 10px 0;
227238
border-left: 0;
228239
width: 30%;
240+
box-sizing: border-box;
229241
border-top-right-radius: 5px;
230242
border-bottom-right-radius: 5px;
231-
background-color: #DEDEDE;
243+
border-right: 1px solid #ccc;
244+
border-bottom: 1px solid #ccc;
232245
}
233246

234247
.tab-receiver .rcmap_wrapper {
235248
float: right;
236249
position: relative;
237-
margin: 0px 0px 20px 0;
238-
width: calc(70% - 0px);
250+
margin: 0px 0px 10px 0;
251+
width: 70%;
252+
box-sizing: border-box;
239253
border-top-left-radius: 5px;
240254
border-bottom-left-radius: 5px;
241-
background-color: #DEDEDE;
255+
border-left: 1px solid #ccc;
256+
border-bottom: 1px solid #ccc;
242257
}
243258

244259
.tab-receiver .rssi_channel_wrapper .head,
@@ -260,6 +275,10 @@
260275
border-top-right-radius: 3px;
261276
}
262277

278+
.tab-receiver .rssi_channel_wrapper select {
279+
width: calc(100% - 10px);
280+
}
281+
263282
.tab-receiver .hybrid_element {
264283
border-right: 1px solid var(--subtleAccent);
265284
}
@@ -288,6 +307,7 @@
288307
height: 22px;
289308
padding-left: 5px;
290309
border: 1px solid var(--subtleAccent);
310+
border-radius: 3px;
291311
margin: 4px;
292312
}
293313

@@ -306,15 +326,22 @@
306326
width: 100%;
307327
}
308328

309-
.tab-receiver .rcInterpolation-label {
310-
margin-top: 6px;
329+
.tab-receiver .rcSmoothing table td {
311330
border-right: none;
312331
}
313332

333+
.tab-receiver .rcSmoothing table select,
334+
.tab-receiver .rcSmoothing table input {
335+
width: 90%;
336+
}
337+
338+
.tab-receiver .rcSmoothing table .helpicon {
339+
margin-top: 0px;
340+
}
341+
314342
.tab-receiver .rcSmoothing td:first-child {
315343
width: 120px;
316-
padding-left:8px;
317-
border-right: none;
344+
padding-left: 8px;
318345
}
319346

320347
.tab-receiver .rcSmoothing td:last-child {
@@ -325,22 +352,6 @@
325352
-webkit-appearance: slider-horizontal;
326353
}
327354

328-
.tab-receiver .curves {
329-
float: left;
330-
margin-right: 10px;
331-
}
332-
333-
.tab-receiver .throttle_curve {
334-
margin: 0 0px 0px 0;
335-
width: 200px;
336-
height: 117px;
337-
border: 1px solid silver;
338-
border-radius: 3px;
339-
background-image: var(--paper);
340-
background-size: 200%;
341-
background-position: center;
342-
}
343-
344355
.tab-receiver select[name="rx_refresh_rate"] {
345356
float: right;
346357
border: 1px solid silver;

src/js/tabs/receiver.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,9 @@ TABS.receiver.initialize = function (callback) {
338338

339339
$('.tab-receiver .rcSmoothing-input-cutoff').show();
340340
$('select[name="rcSmoothing-input-manual-select"]').val("1");
341-
$('.tab-receiver .rc-smoothing-input-blank').hide();
342341
if (RX_CONFIG.rcSmoothingInputCutoff == 0) {
343342
$('.tab-receiver .rcSmoothing-input-cutoff').hide();
344343
$('select[name="rcSmoothing-input-manual-select"]').val("0");
345-
$('.tab-receiver .rc-smoothing-input-blank').show();
346344
}
347345
$('select[name="rcSmoothing-input-manual-select"]').change(function () {
348346
if ($(this).val() == 0) {
@@ -357,11 +355,9 @@ TABS.receiver.initialize = function (callback) {
357355

358356
$('.tab-receiver .rcSmoothing-derivative-cutoff').show();
359357
$('select[name="rcSmoothing-input-derivative-select"]').val("1");
360-
$('.tab-receiver .rc-smoothing-derivative-blank').hide();
361358
if (RX_CONFIG.rcSmoothingDerivativeCutoff == 0) {
362359
$('select[name="rcSmoothing-input-derivative-select"]').val("0");
363360
$('.tab-receiver .rcSmoothing-derivative-cutoff').hide();
364-
$('.tab-receiver .rc-smoothing-derivative-blank').show();
365361
}
366362
$('select[name="rcSmoothing-input-derivative-select"]').change(function () {
367363
if ($(this).val() == 0) {

0 commit comments

Comments
 (0)