From: Adam Dullage <redacted>
Date: Thu, 9 May 2024 15:57:38 +0000 (+0100)
Subject: Refactor Modal, SearchModal and ConfirmModal
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=bba6526aa47261c78ab429d58c02b885c2dd3786;p=flatnotes.git

Refactor Modal, SearchModal and ConfirmModal
---

diff --git a/client/components/ConfirmModal.vue b/client/components/ConfirmModal.vue
index 60adcfa..ee43959 100644
--- a/client/components/ConfirmModal.vue
+++ b/client/components/ConfirmModal.vue
@@ -4,7 +4,10 @@
     :title="title"
     :class="{ 'border border-l-4 border-l-theme-danger': isDanger }"
     :closeHandler="cancelHandler"
+    class="px-6 py-4"
   >
+    <!-- Title -->
+    <div v-if="title" class="mb-6 text-xl">{{ title }}</div>
     <!-- Message -->
     <div class="mb-6">{{ message }}</div>
     <!-- Buttons -->
diff --git a/client/components/Modal.vue b/client/components/Modal.vue
index c075e99..ebbe7a3 100644
--- a/client/components/Modal.vue
+++ b/client/components/Modal.vue
@@ -7,7 +7,7 @@
   >
     <!-- Modal -->
     <div
-      class="relative max-w-[500px] grow rounded-lg border border-theme-border bg-theme-background px-6 py-4 shadow-lg"
+      class="relative max-w-[500px] grow rounded-lg border border-theme-border bg-theme-background shadow-lg"
       :class="$attrs.class"
       @keyup.esc="close"
     >
@@ -17,8 +17,6 @@
         @click="closeHandler"
         class="absolute right-1 top-1"
       />
-      <!-- Title -->
-      <div v-if="title" class="mb-6 text-xl">{{ title }}</div>
       <slot></slot>
     </div>
   </div>
@@ -34,7 +32,6 @@ defineOptions({
   inheritAttrs: false,
 });
 const props = defineProps({
-  title: { type: String },
   showClose: { type: Boolean },
   closeHandlerOverride: Function,
 });
diff --git a/client/partials/SearchInput.vue b/client/partials/SearchInput.vue
index e6e2910..6541bd0 100644
--- a/client/partials/SearchInput.vue
+++ b/client/partials/SearchInput.vue
@@ -9,7 +9,7 @@
       v-model="searchTerm"
       v-focus
       class="w-full focus:outline-none"
-      placeholder="Search"
+      placeholder="Search..."
     />
   </form>
 </template>
diff --git a/client/partials/SearchModal.vue b/client/partials/SearchModal.vue
index c754a55..b8e017c 100644
--- a/client/partials/SearchModal.vue
+++ b/client/partials/SearchModal.vue
@@ -1,7 +1,7 @@
 <template>
-  <Modal v-model="isVisible" class="px-0 py-0 border-none">
+  <Modal v-model="isVisible">
     <SearchInput
-      class="px-5 py-4"
+      class="px-5 py-4 border-none"
       @search="toggleHandler"
       @keyup.esc="toggleHandler"
     />