Merge pull request #1396 from shivendra-webkul/dark-mode

benjpaddock · web-flow · commit f419acbb32f8 · 2024-08-21T17:55:02.000+05:30
Minor issues
diff --git a/packages/Webkul/Admin/src/Resources/assets/css/app.css b/packages/Webkul/Admin/src/Resources/assets/css/app.css
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -1739,6 +1739,7 @@
                 'closed-at'      => 'Closed At',
                 'won-value'      => 'Won Value',
                 'lost-reason'    => 'Lost Reason',
+                'save-btn'       => 'Save',
             ],
         ],
     ],
diff --git a/packages/Webkul/Admin/src/Resources/views/activities/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/activities/edit.blade.php
@@ -116,13 +116,13 @@ class="relative rounded border border-gray-200 px-2 py-1 hover:border-gray-400 f
                                     <li>
                                         <input
                                             type="text"
-                                            class="w-full px-1 py-1"
+                                            class="w-full px-1 py-1 dark:bg-gray-900 dark:text-gray-300"
                                             placeholder="@lang('admin::app.activities.edit.participants')"
                                         />
                                     </li>
                                 </ul>
 
-                                <span class="icon-down-arrow absolute right-1.5 top-1.5 text-2xl"></span>
+                                <span class="icon-down-arrow absolute top-1.5 text-2xl ltr:right-1.5 rtl:left-1.5"></span>
                             </div>
                         </v-multi-lookup-component>
                     </x-admin::form.control-group>
@@ -276,7 +276,7 @@ class="icon-cross-large cursor-pointer p-0.5 text-xl"
                         <li>
                             <input
                                 type="text"
-                                class="w-full px-1 py-1"
+                                class="w-full px-1 py-1 dark:bg-gray-900 dark:text-gray-300"
                                 placeholder="@lang('admin::app.activities.edit.participants')"
                                 v-model.lazy="searchTerm"
                                 v-debounce="500"
@@ -288,13 +288,13 @@ class="w-full px-1 py-1"
                     <div>
                         <template v-if="! isSearching.users && ! isSearching.persons">
                             <span
-                                class="absolute right-1.5 top-1.5 text-2xl"
+                                class="absolute top-1.5 text-2xl ltr:right-1.5 rtl:left-1.5"
                                 :class="[searchTerm.length >= 2 ? 'icon-up-arrow' : 'icon-down-arrow']"
                             ></span>
                         </template>
 
                         <template v-else>
-                            <x-admin::spinner class="absolute right-2 top-2" />
+                            <x-admin::spinner class="absolute top-2 ltr:right-2 rtl:left-2" />
                         </template>
                     </div>
                 </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/components/activities/actions/mail.blade.php b/packages/Webkul/Admin/src/Resources/views/components/activities/actions/mail.blade.php
@@ -71,7 +71,7 @@ class="flex h-[74px] w-[84px] flex-col items-center justify-center gap-1 rounded
                                     :placeholder="trans('admin::app.components.activities.actions.mail.enter-emails')"
                                 />
 
-                                <div class="absolute right-2 top-[9px] flex items-center gap-2">
+                                <div class="absolute top-[9px] flex items-center gap-2 ltr:right-2 rtl:left-2">
                                     <span
                                         class="cursor-pointer font-medium hover:underline dark:text-white"
                                         @click="showCC = ! showCC"
diff --git a/packages/Webkul/Admin/src/Resources/views/components/activities/index.blade.php b/packages/Webkul/Admin/src/Resources/views/components/activities/index.blade.php
@@ -172,9 +172,9 @@ class="flex cursor-pointer items-center gap-1 rounded-md p-1.5"
                                             @{{ "@lang('admin::app.components.activities.index.by-user', ['user' => 'replace'])".replace('replace', activity.user.name) }}
                                         </div>
                                     </div>
-
+                                    
                                     <!-- Activity More Options -->
-                                    <x-admin::dropdown position="bottom-right">
+                                    <x-admin::dropdown position="bottom-{{ in_array(app()->getLocale(), ['fa', 'ar']) ? 'left' : 'right' }}">
                                         <x-slot:toggle>
                                             <template v-if="! isUpdating[activity.id]">
                                                 <button
diff --git a/packages/Webkul/Admin/src/Resources/views/components/attributes/edit/lookup.blade.php b/packages/Webkul/Admin/src/Resources/views/components/attributes/edit/lookup.blade.php
@@ -26,24 +26,16 @@ class="relative inline-block w-full"
                 @click="toggle"
             >
                 <!-- Input Container -->
-                <div class="relative h-10 rounded border p-2 hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400 dark:focus:border-gray-400">
+                <div class="relative rounded border border-gray-200 p-2 hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:text-gray-300">
                     @{{ selectedItem ? selectedItem : "@lang('admin::app.components.attributes.lookup.click-to-add')" }}
-                </div>
-                
-                <!-- Arrow down icon -->
-                <div class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3">
-                    <i class="fas fa-chevron-down text-gray-400"></i>
-                </div>
-            </div>
-
-            <span class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3">
-                <div class="flex items-center justify-center space-x-1">                        
+                    
+                    <!-- Arrow Icon -->
                     <i 
-                        class="text-2xl"
-                        :class="showPopup ? 'icon-up-arrow': 'icon-down-arrow'"
+                        class="absolute text-2xl ltr:right-2 rtl:left-2"
+                        :class="showPopup ? 'icon-up-arrow' : 'icon-down-arrow'"
                     ></i>
                 </div>
-            </span>
+            </div>
 
             <!-- Hidden Input Entity Value -->
             <input
@@ -54,38 +46,36 @@ class="text-2xl"
             
             <div 
                 v-if="showPopup" 
-                class="absolute top-full z-10 mt-1 w-full origin-top transform rounded-lg border border-gray-200 bg-white p-2 shadow-lg transition-transform dark:border-gray-900 dark:bg-gray-800"
+                class="absolute top-full z-10 mt-1 flex w-full origin-top transform flex-col gap-2 rounded-lg border border-gray-200 bg-white p-2 shadow-lg transition-transform dark:border-gray-900 dark:bg-gray-800"
             >
                 <!-- Search Bar -->
-                <div class="relative">
+                <div class="relative flex items-center">
                     <!-- Input Box -->
                     <input
                         type="text"
                         v-model.lazy="searchTerm"
                         v-debounce="500"
-                        class="!mb-2 w-full rounded border border-gray-200 px-2.5 py-2 text-sm font-normal text-gray-800 transition-all hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400 dark:focus:border-gray-400" 
+                        class="w-full rounded border border-gray-200 px-2.5 py-2 text-sm font-normal text-gray-800 transition-all hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400 dark:focus:border-gray-400" 
                         placeholder="@lang('Search...')"
                         ref="searchInput"
                         @keyup="search"
                     />
                 
                     <!-- Search Icon (absolute positioned) -->
-                    <span class="absolute bottom-1 top-2 right-0 flex items-center pr-3">
-                        <div class="flex items-center justify-center space-x-1">
-                            <!-- Loader (optional, based on condition) -->
-                            <i 
-                                v-if="entityId && ! isSearching"
-                                class="icon-cross-large cursor-pointer text-2xl"
-                                @click="remove"
-                            ></i>
-
-                            <!-- Loader (optional, based on condition) -->
-                            <div
-                                class="relative"
-                                v-if="isSearching"
-                            >
-                                <x-admin::spinner />
-                            </div>
+                    <span class="absolute flex items-center ltr:right-2 rtl:left-2">
+                        <!-- Close Icon -->
+                        <i 
+                            v-if="entityId && ! isSearching"
+                            class="icon-cross-large cursor-pointer text-2xl text-gray-600"
+                            @click="remove"
+                        ></i>
+                
+                        <!-- Loader (optional, based on condition) -->
+                        <div
+                            class="relative"
+                            v-if="isSearching"
+                        >
+                            <x-admin::spinner />
                         </div>
                     </span>
                 </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/boolean.blade.php b/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/boolean.blade.php
@@ -63,7 +63,7 @@ class="text-normal py-1 pr-16"
                     </x-admin::form.control-group.control>
                         
                     <!-- Action Buttons -->
-                    <div class="absolute right-2 top-1/2 flex -translate-y-1/2 transform gap-[1px] bg-white">
+                    <div class="absolute right-2 top-1/2 flex -translate-y-1/2 transform gap-[1px]">
                         <button
                             type="button"
                             class="flex items-center justify-center rounded-l-md bg-green-100 p-1 hover:bg-green-200"
diff --git a/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/date.blade.php b/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/date.blade.php
@@ -70,7 +70,7 @@ class="text-normal py-1 pr-16"
                     />
                         
                     <!-- Action Buttons -->
-                    <div class="absolute right-2 top-1/2 flex -translate-y-1/2 transform gap-[1px] bg-white">
+                    <div class="absolute right-2 top-1/2 flex -translate-y-1/2 transform gap-[1px]">
                         <button
                             type="button"
                             class="flex items-center justify-center rounded-l-md bg-green-100 p-1 hover:bg-green-200"
diff --git a/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/file.blade.php b/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/file.blade.php
@@ -58,7 +58,7 @@ class="w-full rounded-md border px-3 py-2.5 text-sm text-gray-600 transition-all
                     />
                         
                     <!-- Action Buttons -->
-                    <div class="absolute right-2 top-1/2 flex -translate-y-1/2 transform gap-[1px] bg-white">
+                    <div class="absolute right-2 top-1/2 flex -translate-y-1/2 transform gap-[1px]">
                         <button
                             type="button"
                             class="flex items-center justify-center rounded-l-md bg-green-100 p-1 hover:bg-green-200"
diff --git a/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/image.blade.php b/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/image.blade.php
@@ -64,7 +64,7 @@ class="w-full rounded-md border px-3 py-2.5 text-sm text-gray-600 transition-all
                     />
                         
                     <!-- Action Buttons -->
-                    <div class="absolute right-2 top-1/2 flex -translate-y-1/2 transform gap-[1px] bg-white">
+                    <div class="absolute right-2 top-1/2 flex -translate-y-1/2 transform gap-[1px]">
                         <button
                             type="button"
                             class="flex items-center justify-center rounded-l-md bg-green-100 p-1 hover:bg-green-200"
diff --git a/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/multiselect.blade.php b/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/multiselect.blade.php
@@ -94,7 +94,7 @@ class="cursor-pointer px-4 py-2 text-gray-800 transition-colors hover:bg-blue-10
                     </div>
                         
                     <!-- Action Buttons -->
-                    <div class="absolute right-2 top-1/2 flex -translate-y-1/2 transform gap-[1px] bg-white">
+                    <div class="absolute right-2 top-1/2 flex -translate-y-1/2 transform gap-[1px]">
                         <button
                             type="button"
                             class="flex items-center justify-center rounded-l-md bg-green-100 p-1 hover:bg-green-200"
diff --git a/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/text.blade.php b/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/inline/text.blade.php
@@ -15,7 +15,7 @@
             <!-- Non-editing view -->
             <div
                 v-if="! isEditing"
-                class="rounded-xs flex h-[34px] items-center"
+                class="rounded-xs flex h-[34px] items-center space-x-2"
                 :class="allowEdit ? 'cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-800' : ''"
                 :style="textPositionStyle"
             >
@@ -59,7 +59,7 @@ class="relative flex w-full flex-col"
                         type="text"
                         ::id="name"
                         ::name="name"
-                        class="!h-[34px] !py-0"
+                        class="!h-[34px] !py-0 pr-16"
                         ::rules="rules"
                         ::label="label"
                         ::placeholder="placeholder"
diff --git a/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/tags.blade.php b/packages/Webkul/Admin/src/Resources/views/components/form/control-group/controls/tags.blade.php
@@ -11,7 +11,7 @@
         <div class="flex min-h-[38px] w-full items-center rounded border border-gray-200 px-2.5 py-1.5 text-sm font-normal text-gray-800 transition-all hover:border-gray-400 dark:border-gray-800 dark:text-white dark:hover:border-gray-400">
             <ul class="flex flex-wrap items-center gap-1">
                 <li
-                    class="flex items-center gap-1 rounded-md bg-gray-100 pl-2 dark:bg-gray-950"
+                    class="flex items-center gap-1 rounded-md bg-gray-100 dark:bg-gray-950 ltr:pl-2 rtl:pr-2"
                     v-for="(tag, index) in tags"
                 >
                     <x-admin::form.control-group.control
@@ -40,6 +40,7 @@ class="icon-cross-large cursor-pointer p-0.5 text-xl"
                             type="text"
                             :name="'temp-' + name"
                             v-bind="field"
+                            class="dark:!bg-gray-900"
                             :placeholder="placeholder"
                             :label="label"
                             @keydown.enter.prevent="addTag"
diff --git a/packages/Webkul/Admin/src/Resources/views/components/layouts/anonymous.blade.php b/packages/Webkul/Admin/src/Resources/views/components/layouts/anonymous.blade.php
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 
 <html
-    class="{{ request()->cookie('dark_mode') ? 'dark' : '' }}"
     lang="{{ app()->getLocale() }}"
     dir="{{ in_array(app()->getLocale(), ['fa', 'ar']) ? 'rtl' : 'ltr' }}"
 >
diff --git a/packages/Webkul/Admin/src/Resources/views/components/layouts/sidebar/index.blade.php b/packages/Webkul/Admin/src/Resources/views/components/layouts/sidebar/index.blade.php
@@ -22,7 +22,7 @@ class="flex gap-2 p-1.5 items-center cursor-pointer hover:rounded-lg {{ $menuIte
                             <p>{{ $menuItem->getName() }}</p>
                         
                             @if ( ! in_array($menuItem->getKey(), ['settings', 'configuration']) && $menuItem->haveChildren())
-                                <i class="icon-right-arrow invisible text-2xl group-hover/item:visible {{ $menuItem->isActive() ? 'text-white' : ''}}"></i>
+                                <i class="icon-right-arrow rtl:icon-left-arrow invisible text-2xl group-hover/item:visible {{ $menuItem->isActive() ? 'text-white' : ''}}"></i>
                             @endif
                         </div>
                     </a>
@@ -33,7 +33,7 @@ class="flex gap-2 p-1.5 items-center cursor-pointer hover:rounded-lg {{ $menuIte
                         && $menuItem->haveChildren()
                     )
                         <div
-                            class="absolute left-[190px] top-0 hidden w-[200px] flex-col bg-gray-100"
+                            class="absolute top-0 hidden w-[200px] flex-col bg-gray-100 ltr:left-[190px] rtl:right-[190px]"
                             :class="[isMenuActive && (hoveringMenu == '{{$menuItem->getKey()}}') ? '!flex' : 'hidden']"
                         >
                             <div class="sidebar-rounded fixed top-14 z-[1000] h-full w-[140px] border bg-white pt-4 dark:border-gray-800 dark:bg-gray-900 max-lg:hidden">
diff --git a/packages/Webkul/Admin/src/Resources/views/components/tags/index.blade.php b/packages/Webkul/Admin/src/Resources/views/components/tags/index.blade.php
@@ -28,7 +28,7 @@ class="flex items-center gap-1 rounded-md bg-rose-100 px-3 py-1.5 text-xs font-m
             </span>
 
             <!-- Add Button -->
-            <x-admin::dropdown ::close-on-click="false">
+            <x-admin::dropdown ::close-on-click="false" position="bottom-{{ in_array(app()->getLocale(), ['fa', 'ar']) ? 'right' : 'left' }}">
                 <x-slot:toggle>
                     <button class="icon-settings-tag rounded-md p-1 text-xl transition-all hover:bg-gray-200 dark:hover:bg-gray-950"></button>
                 </x-slot>
diff --git a/packages/Webkul/Admin/src/Resources/views/leads/view/attributes.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/view/attributes.blade.php
@@ -7,7 +7,7 @@
         @if (bouncer()->hasPermission('leads.edit'))
             <a
                 href="{{ route('admin.leads.edit', $lead->id) }}"
-                class="icon-edit dark:hover:bg-gray-00 rounded-md p-1 text-2xl transition-all hover:bg-gray-950"
+                class="icon-edit rounded-md p-1 text-2xl transition-all hover:bg-gray-100 dark:hover:bg-gray-950"
                 target="_blank"
             ></a>
         @endif
diff --git a/packages/Webkul/Admin/src/Resources/views/leads/view/stages.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/view/stages.blade.php
@@ -73,7 +73,7 @@ class="relative flex h-7 min-w-24 cursor-pointer items-center justify-center rou
                 <form @submit="handleSubmit($event, handleFormSubmit)">
                     <x-admin::modal ref="stageUpdateModal">
                         <x-slot:header>
-                            <h3 class="text-base font-semibold">
+                            <h3 class="text-base font-semibold dark:text-white">
                                 @lang('admin::app.leads.view.stages.need-more-info')
                             </h3>
                         </x-slot>
@@ -126,7 +126,7 @@ class="relative flex h-7 min-w-24 cursor-pointer items-center justify-center rou
                                 type="submit"
                                 class="primary-button"
                             >
-                                @lang('admin::app.leads.view.activities.actions.note.save-btn')
+                                @lang('admin::app.leads.view.stages.save-btn')
                             </button>
                         </x-slot>
                     </x-admin::modal>
diff --git a/packages/Webkul/Admin/src/Resources/views/mail/index.blade.php b/packages/Webkul/Admin/src/Resources/views/mail/index.blade.php
@@ -160,8 +160,7 @@ class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200
                                         :placeholder="trans('admin::app.mail.index.mail.enter-emails')"
                                     />
                                     
-
-                                    <div class="absolute right-2 top-[9px] flex items-center gap-2">
+                                    <div class="absolute top-[9px] flex items-center gap-2 ltr:right-2 rtl:left-2">
                                         <span
                                             class="cursor-pointer font-medium hover:underline dark:text-white"
                                             @click="showCC = ! showCC"
diff --git a/packages/Webkul/Admin/src/Resources/views/mail/view.blade.php b/packages/Webkul/Admin/src/Resources/views/mail/view.blade.php
diff --git a/packages/Webkul/Admin/src/Resources/views/products/view/inventory.blade.php b/packages/Webkul/Admin/src/Resources/views/products/view/inventory.blade.php
diff --git a/packages/Webkul/Admin/src/Resources/views/quotes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/quotes/create.blade.php
diff --git a/packages/Webkul/Admin/src/Resources/views/quotes/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/quotes/edit.blade.php
