diff options
| author | haslinghuis <mark@numloq.nl> | 2022-03-04 16:45:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-04 16:45:29 +0300 |
| commit | a8d982a47c63616ea970c9eac0bf23cee70d737b (patch) | |
| tree | e3c46407a9debe59c8dc33b353f8c0ea409415c9 | |
| parent | 5b1845ff7434a22c312432b708ff8e0bcc0cfa58 (diff) | |
| parent | 3fcd420903fe283093788263bb29731de8a9add4 (diff) | |
Merge pull request #2848 from limonspb/motor_buttons
Motors tab: moved motor tool buttons away from the bottom panel
| -rw-r--r-- | src/css/tabs/motors.css | 16 | ||||
| -rw-r--r-- | src/tabs/motors.html | 26 |
2 files changed, 25 insertions, 17 deletions
diff --git a/src/css/tabs/motors.css b/src/css/tabs/motors.css index 6c36409a..182f1fbe 100644 --- a/src/css/tabs/motors.css +++ b/src/css/tabs/motors.css @@ -8,9 +8,9 @@ border: 1px solid var(--subtleAccent); width: fit-content; height: 20px; - float: left; margin-right: 55px; border-radius: 3px; + min-width: 150px; } .tab-motors table { @@ -59,7 +59,7 @@ .tab-motors .mixerPreview img { width: 150px; height: 150px; - margin-left: 18px; + margin-left: 10px; } .tab-motors select .escprotocol { @@ -158,6 +158,18 @@ width: calc(100% - 20px); } +.tab-motors .spacer_box.mixer_settings { + padding-bottom: 0px; +} + +.tab-motors .motor_direction_reversed { + padding-top: 10px; +} + +.tab-motors .motor_tool_buttons { + padding-left: 10px; +} + .tab-motors .disarm { margin-bottom: 5px; float: left; diff --git a/src/tabs/motors.html b/src/tabs/motors.html index 6a3e1bdf..2566bfa1 100644 --- a/src/tabs/motors.html +++ b/src/tabs/motors.html @@ -16,10 +16,17 @@ <div class="gui_box_titlebar"> <div class="spacer_box_title" i18n="configurationMixer"></div> </div> - <div class="spacer_box"> + <div class="spacer_box mixer_settings"> <select class="mixerList" id="mixer"> <!-- list generated here --> </select> + <div class="motor_direction_reversed"> + <div style="float: left; height: 20px; margin-right: 15px; margin-left: 3px;"> + <input type="checkbox" id="reverseMotorSwitch" class="toggle" /> + </div> + <span class="freelabel" i18n="configurationReverseMotorSwitch"></span> + <div class="helpicon cf_tip" i18n_title="configurationReverseMotorSwitchHelp"></div> + </div> </div> <div class="grid-row"> <div class="grid-col col6"> @@ -28,14 +35,9 @@ </div> </div> </div> - <div class="spacer_box reverseMotor"> - <div class="topBorderLine"> - <div style="float: left; height: 20px; margin-right: 15px; margin-left: 3px;"> - <input type="checkbox" id="reverseMotorSwitch" class="toggle" /> - </div> - <span class="freelabel" i18n="configurationReverseMotorSwitch"></span> - <div class="helpicon cf_tip" i18n_title="configurationReverseMotorSwitchHelp"></div> - </div> + <div class="btn motor_tool_buttons"> + <a href="#" id="motorOutputReorderDialogOpen" class="tool regular-button" i18n="motorOutputReorderDialogOpen"></a> + <a href="#" id="escDshotDirectionDialog-Open" class="tool regular-button" i18n="escDshotDirectionDialog-Open"></a> </div> </div> </div> @@ -362,11 +364,6 @@ <div class="content_toolbar"> <div class="btn"> - <a href="#" id="motorOutputReorderDialogOpen" class="tool regular-button" i18n="motorOutputReorderDialogOpen"></a> - <a href="#" id="escDshotDirectionDialog-Open" class="tool regular-button" i18n="escDshotDirectionDialog-Open"></a> - </div> - - <div class="btn"> <a class="save disabled" href="#" i18n="motorsButtonSave"></a> </div> </div> @@ -409,5 +406,4 @@ <a href="#" id="escDshotDirectionDialog-closebtn" class="regular-button right" i18n="close"></a> </div> </dialog> - </div> |