From 8ecce6f8ef2f462db09e329554be61fac5aab493 Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Wed, 2 Oct 2024 08:13:46 -0400 Subject: [PATCH 1/2] Use more consistent font sizing throughout --- ui/frontend/ConfigElement.module.css | 2 -- ui/frontend/Header.module.css | 2 +- ui/frontend/MenuGroup.module.css | 2 +- ui/frontend/PopButton.module.css | 2 +- ui/frontend/Stdin.module.css | 2 +- ui/frontend/index.module.css | 4 +++- ui/frontend/shared.module.css | 1 - 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ui/frontend/ConfigElement.module.css b/ui/frontend/ConfigElement.module.css index 3a7a40a16..9107316ac 100644 --- a/ui/frontend/ConfigElement.module.css +++ b/ui/frontend/ConfigElement.module.css @@ -5,7 +5,6 @@ .name { flex: 1; - font-size: 13px; } .notDefault { @@ -46,7 +45,6 @@ padding: 0 1em; color: #777; font-weight: 600; - font-size: 11px; text-align: center; text-transform: uppercase; diff --git a/ui/frontend/Header.module.css b/ui/frontend/Header.module.css index 6f2f8d4cf..e11925914 100644 --- a/ui/frontend/Header.module.css +++ b/ui/frontend/Header.module.css @@ -6,7 +6,7 @@ } .container { - font-size: 12px; + font-size: var(--secondary-font-size); padding: 1.25em 0; justify-content: space-between; } diff --git a/ui/frontend/MenuGroup.module.css b/ui/frontend/MenuGroup.module.css index fdfbcdd87..55bbc159d 100644 --- a/ui/frontend/MenuGroup.module.css +++ b/ui/frontend/MenuGroup.module.css @@ -13,7 +13,7 @@ border-bottom: 1px solid var(--header-main-border); padding-bottom: 10px; font-weight: 700; - font-size: 11px; + font-size: var(--secondary-font-size); text-transform: uppercase; } diff --git a/ui/frontend/PopButton.module.css b/ui/frontend/PopButton.module.css index 7a933acc1..cdea226ea 100644 --- a/ui/frontend/PopButton.module.css +++ b/ui/frontend/PopButton.module.css @@ -3,7 +3,7 @@ $arrow-width: 20px; .container { z-index: 10; - font-size: 12px; + font-size: var(--secondary-font-size); & button:enabled { cursor: pointer; diff --git a/ui/frontend/Stdin.module.css b/ui/frontend/Stdin.module.css index d6834cb72..6d90be040 100644 --- a/ui/frontend/Stdin.module.css +++ b/ui/frontend/Stdin.module.css @@ -27,7 +27,7 @@ } .buttons { - font-size: 11px; + font-size: var(--secondary-font-size); } .menu { diff --git a/ui/frontend/index.module.css b/ui/frontend/index.module.css index 9a19da25c..fdd6e2b72 100644 --- a/ui/frontend/index.module.css +++ b/ui/frontend/index.module.css @@ -2,6 +2,8 @@ :root { /* Fonts */ --primary-font: 'Open Sans', sans-serif; + --primary-font-size: 18px; + --secondary-font-size: calc(0.75 * var(--primary-font-size)); /* Header */ --header-transition: 0.2s ease-in-out; @@ -212,7 +214,7 @@ body { padding: 0 1em; font-family: var(--primary-font); font-optical-sizing: auto; - font-size: 18px; + font-size: var(--primary-font-size); } /* stylelint-disable-next-line selector-class-pattern */ diff --git a/ui/frontend/shared.module.css b/ui/frontend/shared.module.css index d601c7ab3..f7afb7ac2 100644 --- a/ui/frontend/shared.module.css +++ b/ui/frontend/shared.module.css @@ -37,7 +37,6 @@ .-menuItemTitle { font-weight: 600; - font-size: 13px; } .-menuItemFullButton { From 602bbc8846a123cfed056964b5a9992c7515556e Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Wed, 2 Oct 2024 10:30:05 -0400 Subject: [PATCH 2/2] Keep the stdin button anchored at the bottom --- ui/frontend/Stdin.module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/frontend/Stdin.module.css b/ui/frontend/Stdin.module.css index 6d90be040..3de82a799 100644 --- a/ui/frontend/Stdin.module.css +++ b/ui/frontend/Stdin.module.css @@ -1,7 +1,7 @@ .form { display: flex; gap: 0.25em; - align-items: flex-start; + align-items: flex-end; } .multiLine {