From 3ac44a0da2007cf9b529533f6c80373f08bd6ff9 Mon Sep 17 00:00:00 2001 From: VitroidFPV Date: Mon, 13 May 2024 10:38:55 +0200 Subject: [PATCH] Style: Remove calc() for main layout --- src/css/main.less | 48 +++++------------------------------------------ 1 file changed, 5 insertions(+), 43 deletions(-) diff --git a/src/css/main.less b/src/css/main.less index 6a760f05fec..b30c1980ef3 100644 --- a/src/css/main.less +++ b/src/css/main.less @@ -153,9 +153,10 @@ input[type="number"] { font-style: italic; } #main-wrapper { - padding: 0; - height: 100%; + height: 100vh; background-color: var(--surface-100); + display: flex; + flex-direction: column; } #background { background: rgba(0, 0, 0, 0.5); @@ -1285,7 +1286,7 @@ dialog { } .toolbar_fixed_bottom { - .content_toolbar { + &.content_toolbar { display: flex; flex-wrap: wrap; position: sticky; @@ -2274,24 +2275,6 @@ button.active { #scrollicon { display: none; } - #tab-content-container { - height: calc(100% - 83px); - } - #tab-content-container.logopen { - height: calc(100% - 167px); - } - #tab-content-container.header_expanded { - height: calc(100% - 181px); - } - #tab-content-container.header_expanded2 { - height: calc(100% - 145px); - } - #tab-content-container.logopen.header_expanded { - height: calc(100% - 265px); - } - #tab-content-container.logopen.header_expanded2 { - height: calc(100% - 229px); - } .tab_container { position: fixed; z-index: 2000; @@ -2318,27 +2301,6 @@ button.active { border: none; overflow: auto; } - .toolbar_fixed_bottom { - // .content_toolbar.xs-compressed { - // padding-left: 60px; - // box-sizing: border-box; - // height: 50px; - // div { - // margin-bottom: 10px; - // } - // } - // .content_toolbar.xs-compressed.expanded { - // padding-left: 15px; - // padding-bottom: 0; - // height: auto; - // } - // .content_toolbar { - // justify-content: flex-end; - // div { - // padding-bottom: 8px; - // } - // } - } .toolbar_expand_btn { display: block; } @@ -2549,7 +2511,7 @@ button.active { } .toolbar_fixed_bottom { .content_wrapper { - height: calc(100% - 81px); + height: fit-content; overflow-y: auto; position: initial; }