From d483cab118da26a49e4e1149369298990737047e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoe=CC=88=20Bijl?= Date: Wed, 8 Oct 2025 11:00:05 +0200 Subject: [PATCH] [feature] align `drawer` and `compose-panel` components - Neatly aligns both the `.drawer` and `.compose-panel` components - Fixes `.search__input` padding when inside the `.compose-panel` --- .../flavours/glitch/styles/components/drawer.scss | 11 +++++------ .../flavours/glitch/styles/components/search.scss | 1 - .../glitch/styles/components/single_column.scss | 11 ++--------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/components/drawer.scss b/app/javascript/flavours/glitch/styles/components/drawer.scss index bcdbb1b8c..fa02017ac 100644 --- a/app/javascript/flavours/glitch/styles/components/drawer.scss +++ b/app/javascript/flavours/glitch/styles/components/drawer.scss @@ -1,11 +1,12 @@ .drawer { + display: flex; + gap: var(--size-layout-gap); + flex: none; + flex-direction: column; + padding: 10px 5px; width: 300px; box-sizing: border-box; - display: flex; - flex-direction: column; overflow-y: hidden; - padding: 10px 5px; - flex: none; &:first-child { padding-inline-start: 10px; @@ -52,7 +53,6 @@ .drawer__header { display: flex; gap: 10px; - margin-bottom: 10px; padding: 4px; border: 1px solid var(--color-lines); border-radius: var(--drawer-border-radius); @@ -105,7 +105,6 @@ .search { position: relative; - margin-bottom: 10px; flex: none; @include limited-single-column( diff --git a/app/javascript/flavours/glitch/styles/components/search.scss b/app/javascript/flavours/glitch/styles/components/search.scss index bc4eaba9d..48f267232 100644 --- a/app/javascript/flavours/glitch/styles/components/search.scss +++ b/app/javascript/flavours/glitch/styles/components/search.scss @@ -1,6 +1,5 @@ .search { position: relative; - margin-bottom: 10px; } .search__icon, diff --git a/app/javascript/flavours/glitch/styles/components/single_column.scss b/app/javascript/flavours/glitch/styles/components/single_column.scss index 7efcf0c09..faba8e7f5 100644 --- a/app/javascript/flavours/glitch/styles/components/single_column.scss +++ b/app/javascript/flavours/glitch/styles/components/single_column.scss @@ -26,15 +26,8 @@ } } - .search__input { - line-height: 18px; - font-size: 16px; - padding: 15px; - padding-inline-end: 30px; - } - - .search__icon .fa { - top: 15px; + .search { + margin-bottom: 10px; } .navigation-bar {