Skip to content

Commit 97341b9

Browse files
benjpaddockbenjpaddock
authored
Merge pull request #1394 from shivendra-webkul/dark-mode
Fixed settings Dark mode and remove old files
2 parents 4eacc9c + 0de2f4e commit 97341b9

37 files changed

+150
-624
lines changed

‎packages/Webkul/Admin/src/Http/Controllers/Configuration/ConfigurationController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function store(ConfigurationForm $request): RedirectResponse
4646

4747
Event::dispatch('core.configuration.save.after');
4848

49-
session()->flash('success', trans('admin::app.configuration.save-message'));
49+
session()->flash('success', trans('admin::app.configuration.index.save-success'));
5050

5151
return redirect()->back();
5252
}

‎packages/Webkul/Admin/src/Resources/lang/en/app.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,10 +1745,11 @@
17451745

17461746
'configuration' => [
17471747
'index' => [
1748-
'title' => 'Configuration',
1749-
'search' => 'Search',
1750-
'back' => 'Back',
1751-
'save-btn' => 'Save Configuration',
1748+
'back' => 'Back',
1749+
'save-btn' => 'Save Configuration',
1750+
'save-success' => 'Configuration Saved Successfully.',
1751+
'search' => 'Search',
1752+
'title' => 'Configuration',
17521753

17531754
'general' => [
17541755
'title' => 'General',

‎packages/Webkul/Admin/src/Resources/views/activities/edit.blade.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@ class="flex w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-
108108

109109
<!-- Participants Multilookup Vue Component -->
110110
<v-multi-lookup-component>
111-
<div class="relative rounded border border-gray-200 px-2 py-1 hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:hover:border-gray-400 dark:focus:border-gray-400" role="button">
111+
<div
112+
class="relative rounded border border-gray-200 px-2 py-1 hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:hover:border-gray-400 dark:focus:border-gray-400"
113+
role="button"
114+
>
112115
<ul class="flex flex-wrap items-center gap-1">
113116
<li>
114117
<input

‎packages/Webkul/Admin/src/Resources/views/components/activities/actions/activity.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class="flex h-[74px] w-[84px] flex-col items-center justify-center gap-1 rounded
3434
<x-slot:header>
3535
<x-admin::dropdown>
3636
<x-slot:toggle>
37-
<h3 class="flex cursor-pointer items-center gap-1 text-base font-semibold">
37+
<h3 class="flex cursor-pointer items-center gap-1 text-base font-semibold dark:text-white">
3838
@lang('admin::app.components.activities.actions.activity.title') - @{{ selectedType.label }}
3939

4040
<span class="icon-down-arrow text-2xl"></span>
@@ -43,7 +43,7 @@ class="flex h-[74px] w-[84px] flex-col items-center justify-center gap-1 rounded
4343

4444
<x-slot:menu>
4545
<x-admin::dropdown.menu.item
46-
::class="{ 'bg-gray-100': selectedType.value === type.value }"
46+
::class="{ 'bg-gray-100 dark:bg-gray-950': selectedType.value === type.value }"
4747
v-for="type in availableTypes"
4848
@click="selectedType = type"
4949
>

‎packages/Webkul/Admin/src/Resources/views/components/activities/actions/activity/participants.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class="icon-cross-large cursor-pointer p-0.5 text-xl"
3434
<li>
3535
<input
3636
type="text"
37-
class="w-full px-1 py-1"
37+
class="w-full px-1 py-1 dark:bg-gray-900"
3838
placeholder="@lang('admin::app.components.activities.actions.activity.participants.placeholder')"
3939
v-model.lazy="searchTerm"
4040
v-debounce="500"

‎packages/Webkul/Admin/src/Resources/views/components/activities/actions/mail.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ class="flex h-[74px] w-[84px] flex-col items-center justify-center gap-1 rounded
7373

7474
<div class="absolute right-2 top-[9px] flex items-center gap-2">
7575
<span
76-
class="cursor-pointer font-medium hover:underline"
76+
class="cursor-pointer font-medium hover:underline dark:text-white"
7777
@click="showCC = ! showCC"
7878
>
7979
@lang('admin::app.components.activities.actions.mail.cc')
8080
</span>
8181

8282
<span
83-
class="cursor-pointer font-medium hover:underline"
83+
class="cursor-pointer font-medium hover:underline dark:text-white"
8484
@click="showBCC = ! showBCC"
8585
>
8686
@lang('admin::app.components.activities.actions.mail.bcc')

‎packages/Webkul/Admin/src/Resources/views/components/activities/index.blade.php‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,20 @@ class="dark:text-white"
105105

106106
<template v-else>
107107
<!-- Activity Schedule -->
108-
<p v-if="activity.schedule_from && activity.schedule_from">
108+
<p
109+
v-if="activity.schedule_from && activity.schedule_from"
110+
class="dark:text-white"
111+
>
109112
@lang('admin::app.components.activities.index.scheduled-on'):
110113

111114
@{{ $admin.formatDate(activity.schedule_from, 'd MMM yyyy, h:mm A') + ' - ' + $admin.formatDate(activity.schedule_from, 'd MMM yyyy, h:mm A') }}
112115
</p>
113116

114117
<!-- Activity Participants -->
115-
<p v-if="activity.participants?.length">
118+
<p
119+
v-if="activity.participants?.length"
120+
class="dark:text-white"
121+
>
116122
@lang('admin::app.components.activities.index.participants'):
117123

118124
<span class="after:content-[',_'] last:after:content-['']" v-for="(participant, index) in activity.participants">
@@ -121,7 +127,10 @@ class="dark:text-white"
121127
</p>
122128

123129
<!-- Activity Location -->
124-
<p v-if="activity.location">
130+
<p
131+
v-if="activity.location"
132+
class="dark:text-white"
133+
>
125134
@lang('admin::app.components.activities.index.location'):
126135

127136
@{{ activity.location }}

‎packages/Webkul/Admin/src/Resources/views/dashboard/index/top-persons.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ class="flex gap-2.5 border-b p-4 transition-all last:border-b-0 hover:bg-gray-50
4141
4242
<!-- Person Details -->
4343
<div class="flex flex-col gap-1">
44-
<p>@{{ item.name }}</p>
44+
<p class="font-medium text-gray-800 dark:text-white">@{{ item.name }}</p>
4545
46-
<p>@{{ item.emails.map(item => item.value).join(', ') }}</p>
46+
<p class="font-normal text-gray-800 dark:text-white">@{{ item.emails.map(item => item.value).join(', ') }}</p>
4747
</div>
4848
</a>
4949
</div>

‎packages/Webkul/Admin/src/Resources/views/dashboard/index/top-selling-products.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ class="text-gray-600 dark:text-gray-300"
4343
</p>
4444
4545
<div class="flex justify-between">
46-
<p class="font-semibold text-gray-600 dark:text-gray-300">
46+
<p class="font-medium text-gray-800 dark:text-white">
4747
@{{ item.formatted_price }}
4848
</p>
4949
50-
<p class="text-base font-semibold text-gray-800 dark:text-white">
50+
<p class="font-normal text-gray-800 dark:text-white">
5151
@{{ item.formatted_revenue }}
5252
</p>
5353
</div>

‎packages/Webkul/Admin/src/Resources/views/settings/pipelines/create.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</div>
2020

2121
<!-- Title -->
22-
<div class="text-xl font-bold dark:text-gray-300">
22+
<div class="text-xl font-bold dark:text-white">
2323
@lang('admin::app.settings.pipelines.create.title')
2424
</div>
2525
</div>

0 commit comments

Comments
 (0)