From d696dfbd74c66d6e6be38c14e77a9cc5dffc9faa Mon Sep 17 00:00:00 2001 From: guerler Date: Wed, 11 Dec 2024 10:34:16 +0300 Subject: [PATCH 1/3] Use masthead height as margin for window manager --- client/src/style/scss/windows.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/style/scss/windows.scss b/client/src/style/scss/windows.scss index 521f15683d1f..b390eab9c0ee 100644 --- a/client/src/style/scss/windows.scss +++ b/client/src/style/scss/windows.scss @@ -1,6 +1,6 @@ .winbox { border-radius: $border-radius-base; - margin-top: 3rem; + margin-top: $masthead-height; } .winbox.min { From 55250cc52d37c4190eedd41ae8d806d1a1f7bcb1 Mon Sep 17 00:00:00 2001 From: guerler Date: Wed, 11 Dec 2024 10:36:32 +0300 Subject: [PATCH 2/3] Increase nav note size, currently only used for window manager --- client/src/components/Masthead/Masthead.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/Masthead/Masthead.vue b/client/src/components/Masthead/Masthead.vue index 69b1d6cd9624..61101f9a5024 100644 --- a/client/src/components/Masthead/Masthead.vue +++ b/client/src/components/Masthead/Masthead.vue @@ -191,7 +191,7 @@ onMounted(() => { position: absolute; left: 1.6rem; top: 1.6rem; - font-size: 0.4rem; + font-size: 0.6rem; font-weight: bold; } } From 8bc465ecf0b9cdee292236c4a8b989e9f5264d7b Mon Sep 17 00:00:00 2001 From: guerler Date: Wed, 11 Dec 2024 11:17:18 +0300 Subject: [PATCH 3/3] Adjust winbox margins, fix full-screen handling --- client/src/style/scss/windows.scss | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/client/src/style/scss/windows.scss b/client/src/style/scss/windows.scss index b390eab9c0ee..1427bb2b1c2d 100644 --- a/client/src/style/scss/windows.scss +++ b/client/src/style/scss/windows.scss @@ -1,6 +1,15 @@ .winbox { border-radius: $border-radius-base; - margin-top: $masthead-height; + margin-left: 1px; + margin-top: calc($masthead-height + 1px); +} + +.winbox.max { + border-radius: 0; + margin: 0; + .wb-header { + border-radius: 0; + } } .winbox.min { @@ -8,8 +17,9 @@ } .wb-header { - border-radius: $border-radius-base; background: $brand-info; + border-top-left-radius: $border-radius-base; + border-top-right-radius: $border-radius-base; } .wb-icon * {