From 008d5c75204aec44fd8cdcf1f38b3644362219f5 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Thu, 7 Nov 2024 13:57:49 +0100
Subject: [PATCH] (style) improve appearance of <FilterBar>

---
 assets/dark.scss         | 10 ++--------
 assets/style.scss        |  8 +++++++-
 components/FilterBar.vue | 22 +++++++++++++++++-----
 layouts/default.vue      |  9 ---------
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/assets/dark.scss b/assets/dark.scss
index bf6b033d1..d8c625ce9 100644
--- a/assets/dark.scss
+++ b/assets/dark.scss
@@ -11,6 +11,8 @@ body[data-theme="dark"] {
     background-color: $dark !important;
     color: $light;
 
+    --bs-border-color: rgba(66, 70, 73, 0.5);
+
     a { color: $primary-dark; }
     a:hover { color: lighten($primary-dark, 10%); }
     .text-primary { color: $primary-dark !important; }
@@ -147,14 +149,6 @@ body[data-theme="dark"] {
     .bg-warning.text-dark,
     .bg-info.text-dark { color: #212529 !important; }
 
-    /* BORDERS */
-
-    .border,
-    .border-top,
-    .border-end,
-    .border-bottom,
-    .border-start { border-color: rgba(66, 70, 73, 0.5) !important; }
-
     /* BREADCRUMB */
 
     .breadcrumb.border { border-color: #333 !important; }
diff --git a/assets/style.scss b/assets/style.scss
index 94f3e56f1..246ed5517 100644
--- a/assets/style.scss
+++ b/assets/style.scss
@@ -181,8 +181,14 @@ form[inert] {
         margin-left: calc(-50vw + 50% + 3rem);
         margin-right: calc(-50vw + 50% + 3rem);
     }
+}
+
+@include media-breakpoint-up('lg', $grid-breakpoints) {
+    .body {
+        margin-top: $header-margin;
+    }
     .sticky-top {
-        top: 83px;
+        top: $header-height + 3px;
     }
 }
 
diff --git a/components/FilterBar.vue b/components/FilterBar.vue
index e1eff9776..49e599d9d 100644
--- a/components/FilterBar.vue
+++ b/components/FilterBar.vue
@@ -24,8 +24,8 @@ defineExpose({
 </script>
 
 <template>
-    <section class="sticky-top pt-md-2">
-        <div class="input-group bg-white">
+    <section class="sticky-top bg-white rounded">
+        <div class="input-group">
             <span class="input-group-text">
                 <Icon v="filter" />
             </span>
@@ -48,14 +48,17 @@ defineExpose({
                 <T>nouns.submit.action</T>
             </button>
         </div>
-        <div v-if="categories && categories.length > 0" class="btn-group d-flex flex-wrap flex-md-nowrap pt-1 bg-white">
+        <div
+            v-if="categories && categories.length > 0"
+            class="d-flex flex-wrap mt-1 border border-primary rounded overflow-hidden"
+        >
             <button
                 v-for="category of [allCategory, ...categories]"
                 :key="category.text"
                 :class="[
-                    'btn btn-sm',
+                    'btn btn-sm btn-wrapped',
                     filterCategory === category.key ? 'btn-primary' : 'btn-outline-primary',
-                    'd-flex justify-content-center align-items-center gap-1',
+                    'flex-grow-1 d-flex justify-content-center align-items-center gap-1 rounded-0',
                 ]"
                 @click="filterCategory = category.key"
             >
@@ -65,3 +68,12 @@ defineExpose({
         </div>
     </section>
 </template>
+
+<style lang="scss" scoped>
+.btn-wrapped {
+    margin-block-start: calc(-1 * var(--bs-btn-border-width));
+    margin-inline-start: calc(-1 * var(--bs-btn-border-width));
+    border-block-end: none;
+    border-inline-end: none;
+}
+</style>
diff --git a/layouts/default.vue b/layouts/default.vue
index 089b93f66..f9a6d9640 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -170,15 +170,6 @@ export default defineComponent({
     @import "assets/variables";
     @import "~avris-sorter/dist/Sorter.min.css";
 
-    @include media-breakpoint-up('lg', $grid-breakpoints) {
-        .body {
-            margin-top: $header-margin;
-        }
-        .sticky-top {
-            top: $header-height - 1px;
-        }
-    }
-
     .vh {
         min-height: calc(100vh - #{$header-height});
     }