Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-25 01:05:15 +03:00
Code Issues Wiki Activity

Merge pull request #2903 from limonspb/cli_height_fix

Browse source 
Cli tab: vertical flex fix and removing scroll bars
This commit is contained in:
Ivan Efimov 2022-04-23 08:20:46 -05:00 • committed by GitHub
commit b98e042f4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/css/tabs/cli.css
View file

@ -3,7 +3,10 @@
} }
.tab-cli .content_wrapper { .tab-cli .content_wrapper {
height: calc(100% - 92px); flex-direction: column;
display: flex;
overflow-x: hidden;
overflow-y: hidden;
} }
.tab-cli p { .tab-cli p {
@ -15,7 +18,7 @@
border: 1px solid var(--subtleAccent); border: 1px solid var(--subtleAccent);
background-color: rgba(0, 0, 0, 0.75); background-color: rgba(0, 0, 0, 0.75);
margin-top: 0; margin-top: 0;
height: calc(100% - 90px); /* - (p, textarea) */ flex-grow: 1;
background-image: url("../../images/light-wide-1.svg"); background-image: url("../../images/light-wide-1.svg");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 50% 80%; background-position: 50% 80%;
@ -71,6 +74,7 @@
.tab-cli .window .wrapper { .tab-cli .window .wrapper {
white-space: pre-wrap; white-space: pre-wrap;
height: 0px;
} }
.tab-cli .window .error_message { .tab-cli .window .error_message {

6
src/js/tabs/cli.js
View file

@ -363,9 +363,9 @@ const lineFeedCode = 10;
const carriageReturnCode = 13; const carriageReturnCode = 13;
function writeToOutput(text) { function writeToOutput(text) {
const windowWrapper = TABS.cli.GUI.windowWrapper; TABS.cli.GUI.windowWrapper.append(text);
windowWrapper.append(text); const cliWindow = $('.tab-cli .window');
$('.tab-cli .window').scrollTop(windowWrapper.height()); cliWindow.scrollTop(cliWindow.prop("scrollHeight"));
} }
function writeLineToOutput(text) { function writeLineToOutput(text) {