Compare commits

..

2 Commits

Author SHA1 Message Date
yogesh-gohil
6abb76b1b9 fix invalid state class in dark mode 2023-03-25 16:41:53 +05:30
yashkanakiya
97be70e88c add base multiselect 2023-03-21 17:29:06 +05:30
29 changed files with 180 additions and 111 deletions

View File

@@ -50,11 +50,21 @@
</BaseInputGroup>
</template>
</ValidateEach>
<BaseModalFooter>
<div
slot="footer"
class="
z-0
flex
justify-end
mt-4
pt-4
border-t border-gray-200 border-solid border-modal-bg
"
>
<BaseButton :loading="isSaving" variant="primary" type="submit">
{{ $t('general.save') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseCard>
</template>

View File

@@ -57,7 +57,9 @@
</BaseInputGroup>
</BaseInputGrid>
</div>
<BaseModalFooter>
<div
class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
>
<BaseButton
class="mr-3"
variant="primary-outline"
@@ -82,7 +84,7 @@
</template>
{{ $t('general.create') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseModal>
</template>

View File

@@ -47,7 +47,15 @@
</BaseInputGrid>
</div>
<BaseModalFooter>
<div
class="
z-0
flex
justify-end
p-4
border-t border-gray-200 border-solid border-modal-bg
"
>
<BaseButton
type="button"
variant="primary-outline"
@@ -72,7 +80,7 @@
</template>
{{ categoryStore.isEdit ? $t('general.update') : $t('general.save') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseModal>
</template>

View File

@@ -116,7 +116,7 @@
</BaseInputGrid>
</div>
<BaseModalFooter>
<div class="z-0 flex justify-end p-4 bg-gray-50 border-modal-bg">
<BaseButton
class="mr-3 text-sm"
variant="primary-outline"
@@ -141,7 +141,7 @@
</template>
{{ $t('general.save') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseModal>
</template>

View File

@@ -425,7 +425,9 @@
</BaseTabGroup>
</div>
<BaseModalFooter>
<div
class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
>
<BaseButton
class="mr-3 text-sm"
type="button"
@@ -445,7 +447,7 @@
</template>
{{ $t('general.save') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseModal>
</template>

View File

@@ -38,7 +38,7 @@
</BaseInputGroup>
</div>
<BaseModalFooter>
<div class="z-0 flex justify-end p-4 bg-gray-50 border-modal-bg">
<BaseButton
class="mr-3 text-sm"
variant="primary-outline"
@@ -63,7 +63,7 @@
</template>
{{ $t('general.delete') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseModal>
</template>

View File

@@ -150,7 +150,9 @@
@Remove="removeUsedSelectedCurrencies"
/>
</div>
<BaseModalFooter>
<div
class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
>
<BaseButton
class="mr-3"
variant="primary-outline"
@@ -177,7 +179,7 @@
exchangeRateStore.isEdit ? $t('general.update') : $t('general.save')
}}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseModal>
</template>

View File

@@ -20,7 +20,15 @@
@submit="createNewDisk"
>
<template #default="slotProps">
<BaseModalFooter>
<div
class="
z-0
flex
justify-end
p-4
border-t border-solid border-gray-light
"
>
<BaseButton
class="mr-3 text-sm"
variant="primary-outline"
@@ -44,7 +52,7 @@
{{ $t('general.save') }}
</BaseButton>
</BaseModalFooter>
</div>
</template>
</component>
</div>

View File

@@ -89,7 +89,9 @@
</BaseInputGroup>
</BaseInputGrid>
</div>
<BaseModalFooter>
<div
class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
>
<BaseButton
class="mr-3"
variant="primary-outline"
@@ -109,7 +111,7 @@
</template>
{{ itemStore.isEdit ? $t('general.update') : $t('general.save') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</div>
</BaseModal>

View File

@@ -31,7 +31,15 @@
</BaseInputGroup>
</div>
<BaseModalFooter>
<div
class="
z-0
flex
justify-end
p-4
border-t border-gray-200 border-solid border-modal-bg
"
>
<BaseButton
type="button"
variant="primary-outline"
@@ -58,7 +66,7 @@
itemStore.isItemUnitEdit ? $t('general.update') : $t('general.save')
}}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseModal>
</template>

View File

@@ -62,7 +62,9 @@
</BaseInputGroup>
</BaseInputGrid>
</div>
<BaseModalFooter>
<div
class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
>
<BaseButton
variant="primary-outline"
type="button"
@@ -82,7 +84,7 @@
</template>
{{ $t('general.send') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseModal>
</template>

View File

@@ -63,7 +63,16 @@
</BaseInputGroup>
</BaseInputGrid>
</div>
<BaseModalFooter>
<div
class="
z-0
flex
justify-end
px-4
py-4
border-t border-solid border-gray-light
"
>
<BaseButton
class="mr-2"
variant="primary-outline"
@@ -84,7 +93,7 @@
</template>
{{ noteStore.isEdit ? $t('general.update') : $t('general.save') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseModal>
</template>

View File

@@ -29,7 +29,9 @@
</BaseInputGroup>
</div>
<BaseModalFooter>
<div
class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
>
<BaseButton
variant="primary-outline"
class="mr-3"
@@ -54,7 +56,7 @@
: $t('general.save')
}}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseModal>
</template>

View File

@@ -72,7 +72,7 @@
</div>
</div>
<div class="border-t border-gray-200 dark:border-gray-600 py-3">
<div class="border-t border-gray-200 py-3">
<div
class="
grid grid-cols-1
@@ -89,7 +89,7 @@
:key="gIndex"
class="flex flex-col space-y-1"
>
<p class="text-sm text-gray-500 dark:text-gray-200 border-b dark:border-gray-600 pb-1 mb-2">
<p class="text-sm text-gray-500 border-b border-gray-200 pb-1 mb-2">
{{ gIndex }}
</p>
<div
@@ -116,7 +116,15 @@
</span>
</div>
</div>
<BaseModalFooter>
<div
class="
z-0
flex
justify-end
p-4
border-t border-solid border--200 border-modal-bg
"
>
<BaseButton
class="mr-3 text-sm"
variant="primary-outline"
@@ -136,7 +144,7 @@
</template>
{{ !roleStore.isEdit ? $t('general.save') : $t('general.update') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseModal>
</template>

View File

@@ -70,7 +70,7 @@
</div>
</div>
<BaseModalFooter>
<div class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid">
<BaseButton class="mr-3" variant="primary-outline" @click="closeModal">
{{ $t('general.cancel') }}
</BaseButton>
@@ -80,7 +80,7 @@
</template>
{{ $t('general.choose') }}
</BaseButton>
</BaseModalFooter>
</div>
</BaseModal>
</template>

View File

@@ -62,7 +62,9 @@
</BaseInputGroup>
</BaseInputGrid>
</div>
<BaseModalFooter>
<div
class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
>
<BaseButton
class="mr-3"
variant="primary-outline"
@@ -83,7 +85,7 @@
<BaseIcon v-if="!isLoading" name="PhotographIcon" class="h-5 mr-2" />
{{ $t('general.preview') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
<div v-else>
<div class="my-6 mx-4 border border-gray-200 relative">
@@ -104,7 +106,9 @@
></iframe>
</div>
<BaseModalFooter>
<div
class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
>
<BaseButton
class="mr-3"
variant="primary-outline"
@@ -123,7 +127,7 @@
<BaseIcon v-if="!isLoading" name="PaperAirplaneIcon" class="mr-2" />
{{ $t('general.send') }}
</BaseButton>
</BaseModalFooter>
</div>
</div>
</BaseModal>
</template>

View File

@@ -65,7 +65,9 @@
</BaseInputGroup>
</BaseInputGrid>
</div>
<BaseModalFooter>
<div
class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
>
<BaseButton
class="mr-3"
variant="primary-outline"
@@ -91,7 +93,7 @@
</template>
{{ $t('general.preview') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
<div v-else>
<div class="my-6 mx-4 border border-gray-200 relative">
@@ -112,7 +114,9 @@
style="min-height: 500px"
></iframe>
</div>
<BaseModalFooter>
<div
class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
>
<BaseButton
class="mr-3"
variant="primary-outline"
@@ -136,7 +140,7 @@
/>
{{ $t('general.send') }}
</BaseButton>
</BaseModalFooter>
</div>
</div>
</BaseModal>
</template>

View File

@@ -65,7 +65,9 @@
</BaseInputGroup>
</BaseInputGrid>
</div>
<BaseModalFooter>
<div
class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
>
<BaseButton
class="mr-3"
variant="primary-outline"
@@ -91,7 +93,7 @@
</template>
{{ $t('general.preview') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
<div v-else>
<div class="my-6 mx-4 border border-gray-200 relative">
@@ -112,7 +114,9 @@
style="min-height: 500px"
></iframe>
</div>
<BaseModalFooter>
<div
class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
>
<BaseButton
class="mr-3"
variant="primary-outline"
@@ -136,7 +140,7 @@
/>
{{ $t('general.send') }}
</BaseButton>
</BaseModalFooter>
</div>
</div>
</BaseModal>
</template>

View File

@@ -90,7 +90,15 @@
</BaseInputGroup>
</BaseInputGrid>
</div>
<BaseModalFooter>
<div
class="
z-0
flex
justify-end
p-4
border-t border-solid border--200 border-modal-bg
"
>
<BaseButton
class="mr-3 text-sm"
variant="primary-outline"
@@ -114,7 +122,7 @@
</template>
{{ taxTypeStore.isEdit ? $t('general.update') : $t('general.save') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseModal>
</template>

View File

@@ -87,7 +87,9 @@
</BaseInputGrid>
</div>
<BaseModalFooter>
<div
class="z-0 flex justify-end p-4 border-t border-gray-200 border-solid"
>
<BaseButton
class="mr-3 text-sm"
type="button"
@@ -107,7 +109,7 @@
</template>
{{ $t('general.save') }}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseModal>
</template>

View File

@@ -172,7 +172,15 @@
</div>
</div>
<BaseModalFooter>
<div
class="
z-0
flex
justify-end
p-4
border-t border-solid border-gray-light border-modal-bg
"
>
<BaseButton
class="mr-3"
type="button"
@@ -199,7 +207,7 @@
!customFieldStore.isEdit ? $t('general.save') : $t('general.update')
}}
</BaseButton>
</BaseModalFooter>
</div>
</form>
</BaseModal>
</template>

View File

@@ -153,7 +153,7 @@
<BaseSwitch v-model="set_as_default" class="flex" />
</div>
<div class="ml-4 right">
<p class="p-0 mb-1 text-base leading-snug text-black dark:text-white box-title">
<p class="p-0 mb-1 text-base leading-snug text-black box-title">
{{ $t('settings.disk.is_default') }}
</p>
</div>

View File

@@ -132,7 +132,7 @@
<BaseSwitch v-model="set_as_default" class="flex" />
</div>
<div class="ml-4 right">
<p class="p-0 mb-1 text-base leading-snug text-black dark:text-white box-title">
<p class="p-0 mb-1 text-base leading-snug text-black box-title">
{{ $t('settings.disk.is_default') }}
</p>
</div>

View File

@@ -63,7 +63,7 @@
</div>
<div class="ml-4 right">
<p class="p-0 mb-1 text-base leading-snug text-black dark:text-white box-title">
<p class="p-0 mb-1 text-base leading-snug text-black box-title">
{{ $t('settings.disk.is_default') }}
</p>
</div>

View File

@@ -134,7 +134,7 @@
<BaseSwitch v-model="set_as_default" class="flex" />
</div>
<div class="ml-4 right">
<p class="p-0 mb-1 text-base leading-snug text-black dark:text-white box-title">
<p class="p-0 mb-1 text-base leading-snug text-black box-title">
{{ $t('settings.disk.is_default') }}
</p>
</div>

View File

@@ -437,21 +437,22 @@ export default {
required: false,
default: () => ({
container:
'p-0 relative mx-auto w-full flex items-center justify-end box-border cursor-pointer border border-gray-200 rounded-md bg-white text-sm leading-snug outline-none max-h-10',
'p-0 relative mx-auto w-full flex items-center justify-end box-border cursor-pointer border border-gray-200 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-sm leading-snug outline-none max-h-10',
containerDisabled:
'cursor-default bg-gray-200 bg-opacity-50 !text-gray-400',
'bg-gray-200 bg-opacity-50 !text-gray-400 dark:!text-gray-800 !dark:text-gray-500 !cursor-default dark:opacity-25',
containerOpen: '',
containerOpenTop: '',
containerActive: 'ring-1 ring-primary-400 border-primary-400',
containerInvalid:
'border-red-400 ring-red-400 focus:ring-red-400 focus:border-red-400',
containerInvalidActive: 'ring-1 border-red-400 ring-red-400',
'border-red-500 ring-red-500 focus:ring-red-500 focus:border-red-500 dark:border-red-500 dark:ring-red-500 dark:focus:ring-red-500 dark:focus:border-red-500',
containerInvalidActive:
'ring-1 border-red-500 ring-red-500 dark:ring-1 dark:border-red-500 dark:ring-red-500',
singleLabel:
'flex items-center h-full absolute left-0 top-0 pointer-events-none bg-transparent leading-snug pl-3.5',
'flex items-center h-full absolute left-0 top-0 pointer-events-none bg-transparent leading-snug pl-3.5 dark:text-white',
multipleLabel:
'flex items-center h-full absolute left-0 top-0 pointer-events-none bg-transparent leading-snug pl-3.5',
'flex items-center h-full absolute left-0 top-0 pointer-events-none bg-transparent leading-snug pl-3.5 dark:text-white',
search:
'w-full absolute inset-0 outline-none appearance-none box-border border-0 text-sm font-sans bg-white rounded-md pl-3.5',
'w-full absolute inset-0 outline-none appearance-none box-border border-0 text-sm font-sans bg-white rounded-md pl-3.5 border-transparent focus:border-transparent focus:ring-0 dark:bg-gray-700 dark:text-white',
tags: 'grow shrink flex flex-wrap mt-1 pl-2',
tag: 'bg-primary-500 text-white text-sm font-semibold py-0.5 pl-2 rounded mr-1 mb-1 flex items-center whitespace-nowrap',
tagDisabled: 'pr-2 !bg-gray-400 text-white',
@@ -461,12 +462,12 @@ export default {
'bg-multiselect-remove text-white bg-center bg-no-repeat opacity-30 inline-block w-3 h-3 group-hover:opacity-60',
tagsSearchWrapper: 'inline-block relative mx-1 mb-1 grow shrink h-full',
tagsSearch:
'absolute inset-0 border-0 focus:outline-none !shadow-none !focus:shadow-none appearance-none p-0 text-sm font-sans box-border w-full',
'absolute inset-0 border-0 focus:outline-none !shadow-none !focus:shadow-none appearance-none p-0 sm:text-sm font-sans box-border w-full dark:bg-gray-700',
tagsSearchCopy: 'invisible whitespace-pre-wrap inline-block h-px',
placeholder:
'flex items-center h-full absolute left-0 top-0 pointer-events-none bg-transparent leading-snug pl-3.5 text-gray-400 text-sm',
'flex items-center h-full absolute left-0 top-0 pointer-events-none bg-transparent leading-snug pl-3.5 text-gray-400 sm:text-sm dark:text-gray-500',
caret:
'bg-multiselect-caret bg-center bg-no-repeat w-5 h-5 py-px box-content z-5 relative mr-1 opacity-40 shrink-0 grow-0 transition-transform',
'bg-multiselect-caret-black dark:bg-multiselect-caret-white bg-center bg-no-repeat w-5 h-5 py-px box-content z-5 relative mr-1 opacity-40 shrink-0 grow-0 transition-transform dark:text-white',
caretOpen: 'rotate-180 pointer-events-auto',
clear:
'pr-3.5 relative z-10 opacity-40 transition duration-300 shrink-0 grow-0 flex hover:opacity-80',
@@ -475,7 +476,7 @@ export default {
spinner:
'bg-multiselect-spinner bg-center bg-no-repeat w-4 h-4 z-10 mr-3.5 animate-spin shrink-0 grow-0',
dropdown:
'max-h-60 shadow-lg absolute -left-px -right-px -bottom-1 translate-y-full border border-gray-300 mt-1 overflow-y-auto z-50 bg-white flex flex-col rounded-md',
'max-h-60 shadow-lg absolute -left-px -right-px -bottom-1 translate-y-full border border-gray-300 mt-1 overflow-y-auto z-50 bg-white dark:border-gray-600 flex flex-col rounded-md dark:bg-gray-800 dark:shadow-glass',
dropdownTop:
'-translate-y-full -top-2 bottom-auto flex-col-reverse rounded-md',
dropdownHidden: 'hidden',
@@ -483,7 +484,7 @@ export default {
optionsTop: 'flex-col-reverse',
group: 'p-0 m-0',
groupLabel:
'flex text-sm box-border items-center justify-start text-left py-1 px-3 font-semibold bg-gray-200 cursor-default leading-normal',
'flex text-sm box-border items-center justify-start text-left py-1 px-3 font-semibold bg-gray-200 dark:bg-gray-700 dark:text-gray-400 cursor-default leading-normal',
groupLabelPointable: 'cursor-pointer',
groupLabelPointed: 'bg-gray-300 text-gray-700',
groupLabelSelected: 'bg-primary-600 text-white',
@@ -493,15 +494,18 @@ export default {
'text-primary-100 bg-primary-600 bg-opacity-50 cursor-not-allowed',
groupOptions: 'p-0 m-0',
option:
'flex items-center justify-start box-border text-left cursor-pointer text-sm leading-snug py-2 px-3',
optionPointed: 'text-gray-800 bg-gray-100',
'flex items-center justify-start box-border text-left cursor-pointer text-sm leading-snug py-2 px-3 dark:text-gray-200',
optionPointed:
'text-gray-800 bg-gray-100 dark:text-white dark:bg-gray-700/30',
optionSelected: 'text-white bg-primary-500',
optionDisabled: 'text-gray-300 cursor-not-allowed',
optionDisabled: 'text-gray-300 cursor-not-allowed dark:text-gray-400',
optionSelectedPointed: 'text-white bg-primary-500 opacity-90',
optionSelectedDisabled:
'text-primary-100 bg-primary-500 bg-opacity-50 cursor-not-allowed',
noOptions: 'py-2 px-3 text-gray-600 bg-white',
noResults: 'py-2 px-3 text-gray-600 bg-white',
noOptions:
'py-2 px-3 text-gray-600 bg-white dark:bg-gray-700 dark:text-gray-200',
noResults:
'py-2 px-3 text-gray-600 bg-white dark:bg-gray-700 dark:text-gray-200',
fakeInput:
'bg-transparent absolute left-0 right-0 -bottom-px w-full h-px border-0 p-0 appearance-none outline-none text-transparent',
spacer: 'h-9 py-px box-content',

View File

@@ -29,21 +29,8 @@
leave-to="opacity-0"
>
<DialogOverlay
class="
fixed
inset-0
transition-opacity
bg-gray-700
bg-opacity-25
dark:backdrop-blur-sm
dark:bg-gray-900/80
"
>
<BaseDarkHighlight
class="!bg-highlight/[.17] !top-1/2 -translate-y-1/2 mt-5 h-96"
:class="modalSize"
/>
</DialogOverlay>
class="fixed inset-0 transition-opacity bg-gray-700 bg-opacity-25"
/>
</TransitionChild>
<!-- This element is to trick the browser into centering the modal contents. -->
@@ -74,11 +61,7 @@
my-4
${modalSize}
sm:w-full
dark:shadow-glass
dark:border
dark:border-white/10
dark:bg-gray-800/90
border-t-8 border-solid rounded shadow-xl border-primary-500`"
border-t-8 border-solid rounded shadow-xl border-primary-500`"
>
<div
v-if="hasHeaderSlot"
@@ -91,8 +74,6 @@
text-lg
font-medium
text-black
dark:text-white
dark:border-gray-600
border-b border-gray-200 border-solid
"
>

View File

@@ -1,14 +0,0 @@
<template>
<div
class="
z-0
flex
justify-end
p-4
border-t border-gray-200 border-solid
dark:border-gray-600
"
>
<slot />
</div>
</template>

View File

@@ -44,10 +44,15 @@ module.exports = {
88: '22rem',
},
backgroundImage: (theme) => ({
'multiselect-caret': `url("${svgToDataUri(
`<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
<path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
</svg>`
'multiselect-caret-black': `url("${svgToDataUri(
`<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="black">
<path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
</svg>`,
)}")`,
'multiselect-caret-white': `url("${svgToDataUri(
`<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="white">
<path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
</svg>`,
)}")`,
'multiselect-spinner': `url("${svgToDataUri(
`<svg viewBox="0 0 512 512" fill="${theme(