fix: dark mode fixes for email account setting

(cherry picked from commit eee1190f10623b6daa374ed59676f639152ceae7)

# Conflicts:
#	frontend/src/components/Settings/ProfileImageEditor.vue
This commit is contained in:
Shariq Ansari 2025-06-20 17:42:10 +05:30 committed by Mergify
parent 7f18b78be8
commit 5aaacde6e6
7 changed files with 29 additions and 34 deletions

View File

@ -1,8 +1,8 @@
<template> <template>
<SettingsPage <SettingsPage
doctype="ERPNext CRM Settings" doctype="ERPNext CRM Settings"
:title="__('ERPNext Settings')" :title="__('ERPNext settings')"
:successMessage="__('ERPNext Settings updated')" :successMessage="__('ERPNext settings updated')"
class="p-8" class="p-8"
/> />
</template> </template>

View File

@ -1,6 +1,6 @@
<template> <template>
<div <div
class="flex items-center justify-between p-1 py-3 border-b border-gray-200 dark:border-gray-700 cursor-pointer" class="flex items-center justify-between p-1 py-3 border-b border-outline-gray-modals cursor-pointer"
> >
<!-- avatar and name --> <!-- avatar and name -->
<div class="flex items-center justify-between gap-2"> <div class="flex items-center justify-between gap-2">
@ -9,11 +9,11 @@
<p class="text-sm font-semibold text-ink-gray-9"> <p class="text-sm font-semibold text-ink-gray-9">
{{ emailAccount.email_account_name }} {{ emailAccount.email_account_name }}
</p> </p>
<div class="text-sm text-gray-500">{{ emailAccount.email_id }}</div> <div class="text-sm text-ink-gray-4">{{ emailAccount.email_id }}</div>
</div> </div>
</div> </div>
<div> <div>
<Badge variant="subtle" :label="badgeTitle" :theme="gray" /> <Badge variant="subtle" :label="badgeTitle" theme="gray" />
</div> </div>
<!-- email id --> <!-- email id -->
</div> </div>

View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<!-- header --> <!-- header -->
<div class="flex justify-between"> <div class="flex justify-between text-ink-gray-9">
<div class="flex flex-col gap-1 w-9/12"> <div class="flex flex-col gap-1 w-9/12">
<h2 class="flex gap-2 text-xl font-semibold leading-none h-5"> <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
{{ __('Email accounts') }} {{ __('Email accounts') }}
@ -38,7 +38,7 @@
</div> </div>
</div> </div>
<!-- fallback if no email accounts --> <!-- fallback if no email accounts -->
<div v-else class="flex items-center justify-center h-64 text-gray-500"> <div v-else class="flex items-center justify-center h-64 text-ink-gray-4">
{{ __('Please add an email account to continue.') }} {{ __('Please add an email account to continue.') }}
</div> </div>
</div> </div>

View File

@ -5,7 +5,7 @@
<h2 class="text-xl font-semibold text-ink-gray-9"> <h2 class="text-xl font-semibold text-ink-gray-9">
{{ __('Setup Email') }} {{ __('Setup Email') }}
</h2> </h2>
<p class="text-sm text-gray-600"> <p class="text-sm text-ink-gray-5">
{{ __('Choose the email service provider you want to configure.') }} {{ __('Choose the email service provider you want to configure.') }}
</p> </p>
</div> </div>
@ -27,14 +27,15 @@
<div v-if="selectedService" class="flex flex-col gap-4"> <div v-if="selectedService" class="flex flex-col gap-4">
<!-- email service provider info --> <!-- email service provider info -->
<div <div
class="flex items-center gap-2 p-2 rounded-md ring-1 ring-gray-400 dark:ring-gray-700 text-gray-700 dark:text-gray-500" class="flex items-center gap-2 p-2 rounded-md ring-1 ring-outline-gray-3 text-ink-gray-6"
> >
<CircleAlert class="w-5 h-6 w-min-5 w-max-5 min-h-5 max-w-5" /> <CircleAlert class="w-5 h-6 w-min-5 w-max-5 min-h-5 max-w-5" />
<div class="text-xs text-wrap"> <div class="text-xs text-wrap">
{{ selectedService.info }} {{ selectedService.info }}
<a :href="selectedService.link" target="_blank" class="underline" <a :href="selectedService.link" target="_blank" class="underline">
>here</a {{ __('here') }}
>. </a>
.
</div> </div>
</div> </div>
<!-- service provider fields --> <!-- service provider fields -->
@ -66,23 +67,22 @@
:name="field.name" :name="field.name"
:type="field.type" :type="field.type"
/> />
<p class="text-gray-500 text-p-sm">{{ field.description }}</p> <p class="text-ink-gray-4 text-p-sm">{{ field.description }}</p>
</div> </div>
</div> </div>
<ErrorMessage v-if="error" class="ml-1" :message="error" /> <ErrorMessage class="ml-1" :message="error" />
</div> </div>
</div> </div>
<!-- action button --> <!-- action button -->
<div v-if="selectedService" class="flex justify-between mt-auto"> <div v-if="selectedService" class="flex justify-between mt-auto">
<Button <Button
label="Back" :label="__('Back')"
theme="gray"
variant="outline" variant="outline"
:disabled="addEmailRes.loading" :disabled="addEmailRes.loading"
@click="emit('update:step', 'email-list')" @click="emit('update:step', 'email-list')"
/> />
<Button <Button
label="Create" :label="__('Create')"
variant="solid" variant="solid"
:loading="addEmailRes.loading" :loading="addEmailRes.loading"
@click="createEmailAccount" @click="createEmailAccount"

View File

@ -14,16 +14,16 @@
</div> </div>
<!-- banner for setting up email account --> <!-- banner for setting up email account -->
<div <div
class="flex items-center gap-2 p-2 rounded-md ring-1 ring-gray-400 dark:ring-gray-700" class="flex items-center gap-2 p-2 rounded-md ring-1 ring-outline-gray-3"
> >
<CircleAlert <CircleAlert
class="size-6 text-gray-500 w-min-5 w-max-5 min-h-5 max-w-5" class="size-6 text-ink-gray-4 w-min-5 w-max-5 min-h-5 max-w-5"
/> />
<div class="text-xs text-gray-700 dark:text-gray-500 text-wrap"> <div class="text-xs text-ink-gray-6 text-wrap">
{{ info.description }} {{ info.description }}
<a :href="info.link" target="_blank" class="underline">{{ <a :href="info.link" target="_blank" class="underline">
__('here') {{ __('here') }}
}}</a> </a>
. .
</div> </div>
</div> </div>
@ -56,7 +56,7 @@
:name="field.name" :name="field.name"
:type="field.type" :type="field.type"
/> />
<p class="text-gray-500 text-p-sm">{{ field.description }}</p> <p class="text-ink-gray-4 text-p-sm">{{ field.description }}</p>
</div> </div>
</div> </div>
<ErrorMessage v-if="error" class="ml-1" :message="error" /> <ErrorMessage v-if="error" class="ml-1" :message="error" />

View File

@ -1,14 +1,11 @@
<template> <template>
<div <div
class="flex items-center justify-center w-8 h-8 bg-gray-100 cursor-pointer rounded-xl hover:bg-gray-200" class="flex items-center justify-center w-8 h-8 bg-surface-gray-2 cursor-pointer rounded-xl hover:bg-surface-gray-3"
:class="{ 'ring-2 ring-gray-500 dark:ring-gray-100': selected }" :class="{ 'ring-2 ring-outline-gray-4': selected }"
> >
<img :src="logo" class="w-4 h-4" /> <img :src="logo" class="w-4 h-4" />
</div> </div>
<p <p v-if="serviceName" class="text-xs text-center text-ink-gray-6 mt-2">
v-if="serviceName"
class="text-xs text-center text-gray-700 dark:text-gray-500 mt-2"
>
{{ serviceName }} {{ serviceName }}
</p> </p>
</template> </template>
@ -29,5 +26,3 @@ defineProps({
}, },
}) })
</script> </script>
<style scoped></style>

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="flex h-full flex-col gap-8 p-8 text-ink-gray-9"> <div class="flex h-full flex-col gap-6 p-8 text-ink-gray-9">
<div class="flex-1 flex flex-col gap-8 mt-2 overflow-y-auto"> <div class="flex-1 flex flex-col gap-6 mt-2 overflow-y-auto">
<div v-if="profile" class="flex w-full items-center justify-between"> <div v-if="profile" class="flex w-full items-center justify-between">
<FileUploader <FileUploader
@success="(file) => updateImage(file.file_url)" @success="(file) => updateImage(file.file_url)"