Compare commits

..

2 Commits

Author SHA1 Message Date
yogesh-gohil
bd8dd3f7c4 fix tab-list border in dark-mode 2023-03-28 12:22:36 +05:30
yashkanakiya
d221431bd7 add dark mode in base tabGroup and tab 2023-03-23 16:28:46 +05:30
16 changed files with 57 additions and 92 deletions

View File

@@ -130,6 +130,7 @@
mt-5 mt-5
list-none list-none
border-b-2 border-gray-200 border-solid border-b-2 border-gray-200 border-solid
dark:border-gray-600
" "
> >
<!-- Tabs --> <!-- Tabs -->

View File

@@ -127,6 +127,7 @@
mt-5 mt-5
list-none list-none
border-b-2 border-gray-200 border-solid border-b-2 border-gray-200 border-solid
dark:border-gray-600
" "
> >
<!-- Tabs --> <!-- Tabs -->

View File

@@ -121,6 +121,7 @@
mt-5 mt-5
list-none list-none
border-b-2 border-gray-200 border-solid border-b-2 border-gray-200 border-solid
dark:border-gray-600
" "
> >
<!-- Tabs --> <!-- Tabs -->

View File

@@ -113,10 +113,10 @@
<div v-if="companyStore.companies.length !== 1" class="py-5"> <div v-if="companyStore.companies.length !== 1" class="py-5">
<BaseDivider class="my-4" /> <BaseDivider class="my-4" />
<h3 class="text-lg leading-6 font-medium text-gray-900 dark:text-white"> <h3 class="text-lg leading-6 font-medium text-gray-900">
{{ $tc('settings.company_info.delete_company') }} {{ $tc('settings.company_info.delete_company') }}
</h3> </h3>
<div class="mt-2 max-w-xl text-sm text-gray-500 dark:text-gray-400"> <div class="mt-2 max-w-xl text-sm text-gray-500">
<p> <p>
{{ $tc('settings.company_info.delete_company_description') }} {{ $tc('settings.company_info.delete_company_description') }}
</p> </p>

View File

@@ -7,7 +7,7 @@
{{ $t('settings.menu_title.exchange_rate') }} {{ $t('settings.menu_title.exchange_rate') }}
</h6> </h6>
<p <p
class="mt-2 text-sm leading-snug text-left text-gray-500 dark:text-gray-400" class="mt-2 text-sm leading-snug text-left text-gray-500"
style="max-width: 680px" style="max-width: 680px"
> >
{{ $t('settings.exchange_rate.providers_description') }} {{ $t('settings.exchange_rate.providers_description') }}

View File

@@ -1,12 +1,12 @@
<template> <template>
<BaseHeading <h6 class="text-gray-900 text-lg font-medium">
type="heading-title"
:subtitle="
$t(`settings.customization.${type}s.${type}_number_format_description`)
"
>
{{ $t(`settings.customization.${type}s.${type}_number_format`) }} {{ $t(`settings.customization.${type}s.${type}_number_format`) }}
</BaseHeading> </h6>
<p class="mt-1 text-sm text-gray-500">
{{
$t(`settings.customization.${type}s.${type}_number_format_description`)
}}
</p>
<div class="overflow-x-auto"> <div class="overflow-x-auto">
<table class="w-full mt-6 table-fixed"> <table class="w-full mt-6 table-fixed">
@@ -29,7 +29,6 @@
leading-5 leading-5
text-left text-gray-700 text-left text-gray-700
border-t border-b border-gray-200 border-solid border-t border-b border-gray-200 border-solid
dark:border-gray-600
" "
></th> ></th>
<th <th
@@ -42,7 +41,6 @@
leading-5 leading-5
text-left text-gray-700 text-left text-gray-700
border-t border-b border-gray-200 border-solid border-t border-b border-gray-200 border-solid
dark:text-gray-300 dark:border-gray-600
" "
> >
Component Component
@@ -57,7 +55,6 @@
leading-5 leading-5
text-left text-gray-700 text-left text-gray-700
border-t border-b border-gray-200 border-solid border-t border-b border-gray-200 border-solid
dark:text-gray-300 dark:border-gray-600
" "
> >
Parameter Parameter
@@ -72,14 +69,13 @@
leading-5 leading-5
text-left text-gray-700 text-left text-gray-700
border-t border-b border-gray-200 border-solid border-t border-b border-gray-200 border-solid
dark:border-gray-600
" "
></th> ></th>
</tr> </tr>
</thead> </thead>
<draggable <draggable
v-model="selectedFields" v-model="selectedFields"
class="divide-y divide-gray-200 dark:divide-gray-600" class="divide-y divide-gray-200"
item-key="id" item-key="id"
tag="tbody" tag="tbody"
handle=".handle" handle=".handle"
@@ -101,13 +97,12 @@
whitespace-nowrap whitespace-nowrap
mr-2 mr-2
min-w-[200px] min-w-[200px]
dark:text-primary-400
" "
> >
{{ element.label }} {{ element.label }}
</label> </label>
<p class="text-xs text-gray-500 dark:text-gray-400 mt-1"> <p class="text-xs text-gray-500 mt-1">
{{ element.description }} {{ element.description }}
</p> </p>
</td> </td>

View File

@@ -1,12 +1,10 @@
<template> <template>
<BaseHeading <h6 class="text-gray-900 text-lg font-medium">
type="heading-title"
:subtitle="
$t('settings.customization.estimates.convert_estimate_description')
"
>
{{ $tc('settings.customization.estimates.convert_estimate_options') }} {{ $tc('settings.customization.estimates.convert_estimate_options') }}
</BaseHeading> </h6>
<p class="mt-1 text-sm text-gray-500">
{{ $t('settings.customization.estimates.convert_estimate_description') }}
</p>
<BaseInputGroup required> <BaseInputGroup required>
<BaseRadio <BaseRadio

View File

@@ -1,13 +1,11 @@
<template> <template>
<form @submit.prevent="submitForm"> <form @submit.prevent="submitForm">
<BaseHeading <h6 class="text-gray-900 text-lg font-medium">
type="heading-title"
:subtitle="
$t('settings.customization.estimates.default_formats_description')
"
>
{{ $t('settings.customization.estimates.default_formats') }} {{ $t('settings.customization.estimates.default_formats') }}
</BaseHeading> </h6>
<p class="mt-1 text-sm text-gray-500 mb-2">
{{ $t('settings.customization.estimates.default_formats_description') }}
</p>
<BaseInputGroup <BaseInputGroup
:label=" :label="

View File

@@ -1,13 +1,11 @@
<template> <template>
<form @submit.prevent="submitForm"> <form @submit.prevent="submitForm">
<BaseHeading <h6 class="text-gray-900 text-lg font-medium">
type="heading-title"
:subtitle="
$t('settings.customization.estimates.expiry_date_description')
"
>
{{ $t('settings.customization.estimates.expiry_date') }} {{ $t('settings.customization.estimates.expiry_date') }}
</BaseHeading> </h6>
<p class="mt-1 text-sm text-gray-500 mb-2">
{{ $t('settings.customization.estimates.expiry_date_description') }}
</p>
<BaseSwitchSection <BaseSwitchSection
v-model="expiryDateAutoField" v-model="expiryDateAutoField"

View File

@@ -1,13 +1,11 @@
<template> <template>
<form @submit.prevent="submitForm"> <form @submit.prevent="submitForm">
<BaseHeading <h6 class="text-gray-900 text-lg font-medium">
type="heading-title"
:subtitle="
$t('settings.customization.invoices.default_formats_description')
"
>
{{ $t('settings.customization.invoices.default_formats') }} {{ $t('settings.customization.invoices.default_formats') }}
</BaseHeading> </h6>
<p class="mt-1 text-sm text-gray-500 mb-2">
{{ $t('settings.customization.invoices.default_formats_description') }}
</p>
<BaseInputGroup <BaseInputGroup
:label="$t('settings.customization.invoices.default_invoice_email_body')" :label="$t('settings.customization.invoices.default_invoice_email_body')"

View File

@@ -1,13 +1,11 @@
<template> <template>
<form @submit.prevent="submitForm"> <form @submit.prevent="submitForm">
<BaseHeading <h6 class="text-gray-900 text-lg font-medium">
type="heading-title" {{ $t('settings.customization.invoices.due_date') }}
:subtitle=" </h6>
$t('settings.customization.invoices.due_date_description') <p class="mt-1 text-sm text-gray-500 mb-2">
" {{ $t('settings.customization.invoices.due_date_description') }}
> </p>
{{ $t('settings.customization.invoices.due_date') }}
</BaseHeading>
<BaseSwitchSection <BaseSwitchSection
v-model="dueDateAutoField" v-model="dueDateAutoField"

View File

@@ -1,12 +1,10 @@
<template> <template>
<BaseHeading <h6 class="text-gray-900 text-lg font-medium">
type="heading-title"
:subtitle="
$t('settings.customization.invoices.retrospective_edits_description')
"
>
{{ $tc('settings.customization.invoices.retrospective_edits') }} {{ $tc('settings.customization.invoices.retrospective_edits') }}
</BaseHeading> </h6>
<p class="mt-1 text-sm text-gray-500">
{{ $t('settings.customization.invoices.retrospective_edits_description') }}
</p>
<BaseInputGroup required> <BaseInputGroup required>
<BaseRadio <BaseRadio

View File

@@ -1,13 +1,11 @@
<template> <template>
<form @submit.prevent="submitForm"> <form @submit.prevent="submitForm">
<BaseHeading <h6 class="text-gray-900 text-lg font-medium">
type="heading-title"
:subtitle="
$t('settings.customization.payments.default_formats_description')
"
>
{{ $t('settings.customization.payments.default_formats') }} {{ $t('settings.customization.payments.default_formats') }}
</BaseHeading> </h6>
<p class="mt-1 text-sm text-gray-500 mb-2">
{{ $t('settings.customization.payments.default_formats_description') }}
</p>
<BaseInputGroup <BaseInputGroup
:label="$t('settings.customization.payments.default_payment_email_body')" :label="$t('settings.customization.payments.default_payment_email_body')"

View File

@@ -2,21 +2,6 @@
<h6 :class="typeClass"> <h6 :class="typeClass">
<slot /> <slot />
</h6> </h6>
<p
v-if="subtitle"
class="
mt-2
text-sm
leading-snug
text-gray-500
dark:text-gray-400
max-w-[680px]
"
>
{{ subtitle }}
</p>
</template> </template>
<script setup> <script setup>
@@ -29,16 +14,12 @@ const props = defineProps({
return ['section-title', 'heading-title'].indexOf(value) !== -1 return ['section-title', 'heading-title'].indexOf(value) !== -1
}, },
}, },
subtitle: {
type: String,
default: '',
},
}) })
const typeClass = computed(() => { const typeClass = computed(() => {
return { return {
'text-gray-900 text-lg font-medium dark:text-white': props.type === 'heading-title', 'text-gray-900 text-lg font-medium': props.type === 'heading-title',
'text-gray-500 uppercase text-base dark:text-gray-300': props.type === 'section-title', 'text-gray-500 uppercase text-base': props.type === 'section-title',
} }
}) })
</script> </script>

View File

@@ -11,7 +11,7 @@
mt-2 mt-2
text-sm text-sm
leading-snug leading-snug
text-left text-gray-500 dark:text-gray-400 text-left text-gray-500
max-w-[680px] max-w-[680px]
" "
> >

View File

@@ -7,7 +7,7 @@
> >
<TabList <TabList
:class="[ :class="[
'flex border-b border-grey-light', 'flex border-b border-grey-light dark:border-gray-600',
'relative overflow-x-auto overflow-y-hidden', 'relative overflow-x-auto overflow-y-hidden',
'lg:pb-0 lg:ml-0', 'lg:pb-0 lg:ml-0',
]" ]"
@@ -22,8 +22,8 @@
:class="[ :class="[
'px-8 py-2 text-sm leading-5 font-medium flex items-center relative border-b-2 mt-4 focus:outline-none whitespace-nowrap', 'px-8 py-2 text-sm leading-5 font-medium flex items-center relative border-b-2 mt-4 focus:outline-none whitespace-nowrap',
selected selected
? ' border-primary-400 text-black font-medium' ? 'border-primary-400 text-black font-medium dark:text-white'
: 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300', : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 dark:text-gray-400 dark:hover:border-gray-500',
]" ]"
> >
{{ tab.title }} {{ tab.title }}