From f1966b45602a3b85620755d61e68a43159396c4e Mon Sep 17 00:00:00 2001 From: nizune <9-nizune@users.noreply.gitlab.insrt.uk> Date: Sun, 1 Aug 2021 20:41:53 +0200 Subject: [PATCH] Cleaned up titlebar look --- src/components/native/Titlebar.tsx | 13 +++++++++---- src/pages/settings/Settings.module.scss | 5 ++++- src/pages/settings/panes/Native.tsx | 1 + 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/components/native/Titlebar.tsx b/src/components/native/Titlebar.tsx index cd764a1a..c3677c53 100644 --- a/src/components/native/Titlebar.tsx +++ b/src/components/native/Titlebar.tsx @@ -1,4 +1,3 @@ -import { X, Minus, Square } from "@styled-icons/boxicons-regular"; import { Wrench } from "@styled-icons/boxicons-solid"; import styled from "styled-components"; @@ -11,6 +10,7 @@ const TitlebarBase = styled.div` gap: 6px; user-select: none; align-items: center; + .title { flex-grow: 1; @@ -20,15 +20,20 @@ const TitlebarBase = styled.div` font-weight: 600; margin-inline-start: 10px; margin-top: 4px; - gap: 8px; + gap: 6px; display: flex; align-items: center; justify-content: flex-start; + z-index: 90000; + color: var(--titlebar-logo-color); svg { - height: calc(var(--titlebar-height) / 3); margin-bottom: 4px; } + + svg:first-child { + height: calc(var(--titlebar-height) / 3); + } } .actions { @@ -73,7 +78,7 @@ export function Titlebar() { stroke-width="1" /> - {window.native.getConfig().build === "dev" && } + {window.native.getConfig().build === "dev" && }
diff --git a/src/pages/settings/Settings.module.scss b/src/pages/settings/Settings.module.scss index 97fc2d72..b34ddd97 100644 --- a/src/pages/settings/Settings.module.scss +++ b/src/pages/settings/Settings.module.scss @@ -80,7 +80,7 @@ background: var(--primary-background); .sidebar { - flex: 2; + flex: 1 0 218px; display: flex; flex-shrink: 0; overflow-y: scroll; @@ -91,6 +91,9 @@ width: 218px; padding: 60px 8px; height: fit-content; + display: flex; + gap: 2px; + flex-direction: column; } .divider { diff --git a/src/pages/settings/panes/Native.tsx b/src/pages/settings/panes/Native.tsx index 2d3b3c56..cab36b8b 100644 --- a/src/pages/settings/panes/Native.tsx +++ b/src/pages/settings/panes/Native.tsx @@ -24,6 +24,7 @@ export function Native(props: Props) { return (
+

App Behavior