Skip to content

Commit

Permalink
fix view sidebar and customer dropdown dark issue (#1210)
Browse files Browse the repository at this point in the history
* fix view sidebar and customer dropdown dark issue

* fix update app settings dark mode

---------

Co-authored-by: yogesh-gohil <yogeshgohil1611@gmail.com>
  • Loading branch information
yashkanakiya and yogesh-gohil committed Mar 31, 2023
1 parent de235a9 commit ba76986
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 17 deletions.
Expand Up @@ -40,6 +40,7 @@
px-4
md:px-8
py-1.5
dark:text-gray-200
"
>
{{ $tc('settings.roles.permission', 2) }}
Expand Down
16 changes: 8 additions & 8 deletions resources/scripts/admin/views/customers/View.vue
Expand Up @@ -34,8 +34,8 @@
v-if="userStore.hasAbilities(abilities.CREATE_ESTIMATE)"
:to="`/admin/estimates/create?customer=${$route.params.id}`"
>
<BaseDropdownItem class="">
<BaseIcon name="DocumentIcon" class="mr-3 text-gray-600" />
<BaseDropdownItem v-slot="slotProps">
<BaseIcon name="DocumentIcon" :class="slotProps.class" />
{{ $t('estimates.new_estimate') }}
</BaseDropdownItem>
</router-link>
Expand All @@ -44,8 +44,8 @@
v-if="userStore.hasAbilities(abilities.CREATE_INVOICE)"
:to="`/admin/invoices/create?customer=${$route.params.id}`"
>
<BaseDropdownItem>
<BaseIcon name="DocumentTextIcon" class="mr-3 text-gray-600" />
<BaseDropdownItem v-slot="slotProps">
<BaseIcon name="DocumentTextIcon" :class="slotProps.class" />
{{ $t('invoices.new_invoice') }}
</BaseDropdownItem>
</router-link>
Expand All @@ -54,8 +54,8 @@
v-if="userStore.hasAbilities(abilities.CREATE_PAYMENT)"
:to="`/admin/payments/create?customer=${$route.params.id}`"
>
<BaseDropdownItem>
<BaseIcon name="CreditCardIcon" class="mr-3 text-gray-600" />
<BaseDropdownItem v-slot="slotProps">
<BaseIcon name="CreditCardIcon" :class="slotProps.class" />
{{ $t('payments.new_payment') }}
</BaseDropdownItem>
</router-link>
Expand All @@ -64,8 +64,8 @@
v-if="userStore.hasAbilities(abilities.CREATE_EXPENSE)"
:to="`/admin/expenses/create?customer=${$route.params.id}`"
>
<BaseDropdownItem>
<BaseIcon name="CalculatorIcon" class="mr-3 text-gray-600" />
<BaseDropdownItem v-slot="slotProps">
<BaseIcon name="CalculatorIcon" :class="slotProps.class" />
{{ $t('expenses.new_expense') }}
</BaseDropdownItem>
</router-link>
Expand Down
Expand Up @@ -13,6 +13,7 @@
xl:ml-64
w-88
xl:block
dark:bg-gray-800
"
>
<div
Expand All @@ -25,6 +26,7 @@
pb-2
border border-gray-200 border-solid
height-full
dark:border-gray-600
"
>
<BaseInput
Expand Down Expand Up @@ -59,6 +61,7 @@
mb-2
text-sm
border-b border-gray-200 border-solid
dark:border-gray-600
"
>
{{ $t('general.sort_by') }}
Expand Down Expand Up @@ -114,6 +117,7 @@
border-l border-gray-200 border-solid
sidebar
base-scroll
dark:border-gray-600
"
>
<div v-for="(customer, index) in customerList" :key="index">
Expand All @@ -122,9 +126,9 @@
:id="'customer-' + customer.id"
:to="`/admin/customers/${customer.id}/view`"
:class="[
'flex justify-between p-4 items-center cursor-pointer hover:bg-gray-100 border-l-4 border-transparent',
'flex justify-between p-4 items-center cursor-pointer hover:bg-gray-100 border-l-4 border-transparent dark:hover:bg-gray-700',
{
'bg-gray-100 border-l-4 border-primary-500 border-solid':
'bg-gray-100 border-l-4 border-primary-500 border-solid dark:border-primary-400 dark:bg-gray-700':
hasActiveUrl(customer.id),
},
]"
Expand All @@ -143,6 +147,7 @@
text-black
capitalize
truncate
dark:text-white
"
/>

Expand All @@ -157,6 +162,7 @@
font-medium
leading-5
text-gray-600
dark:text-gray-400
"
/>
</div>
Expand All @@ -175,7 +181,7 @@
</div>
<p
v-if="!customerList?.length && !isFetching"
class="flex justify-center px-4 mt-5 text-sm text-gray-600"
class="flex justify-center px-4 mt-5 text-sm text-gray-600 dark:text-gray-300"
>
{{ $t('customers.no_matching_customers') }}
</p>
Expand Down
12 changes: 6 additions & 6 deletions resources/scripts/admin/views/settings/UpdateAppSetting.vue
Expand Up @@ -92,7 +92,7 @@
<tr
v-for="(ext, i) in requiredExtentions"
:key="i"
class="p-2 border-2 border-gray-200"
class="p-2 border-2 border-gray-200 dark:border-gray-600"
>
<td width="70%" class="p-2 text-sm truncate">
{{ i }}
Expand Down Expand Up @@ -121,7 +121,7 @@
{{ $t('settings.update_app.update_progress') }}
</h6>
<p
class="mb-8 text-sm leading-snug text-gray-500"
class="mb-8 text-sm leading-snug text-gray-500 dark:text-gray-400"
style="max-width: 480px"
>
{{ $t('settings.update_app.progress_text') }}
Expand All @@ -135,11 +135,11 @@
<li
v-for="step in updateSteps"
:key="step.stepUrl"
class="flex justify-between w-full py-3 border-b border-gray-200 border-solid last:border-b-0"
class="flex justify-between w-full py-3 border-b border-gray-200 dark:border-gray-600 border-solid last:border-b-0"
>
<p class="m-0 text-sm leading-8">{{ $t(step.translationKey) }}</p>
<p class="m-0 text-sm dark:text-gray-300 leading-8">{{ $t(step.translationKey) }}</p>
<div class="flex flex-row items-center">
<span v-if="step.time" class="mr-3 text-xs text-gray-500">
<span v-if="step.time" class="mr-3 text-xs text-gray-500 dark:text-gray-300">
{{ step.time }}
</span>
<span
Expand Down Expand Up @@ -275,7 +275,7 @@ function statusClass(step) {
case 'running':
return 'text-blue-400 bg-blue-100'
case 'error':
return 'text-danger bg-red-200'
return 'text-red-400 bg-red-200'
default:
return ''
}
Expand Down

0 comments on commit ba76986

Please sign in to comment.