Ryan/drop-base
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop-base.git synced 2025-11-09 20:12:16 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: unmerged changes

Browse Source
This commit is contained in:
DecDuck
2025-02-15 08:35:16 +11:00
parent 77b85c97d0
commit 637b4e1e9b
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/LoadingButton.vue
View File

@ -1,15 +1,11 @@
<template> <template>
<button <button
type="submit" type="submit"
<<<<<<< Updated upstream
:class="[ :class="[
styles[style].base, styles[style].base,
props.disabled ? styles[style].disabled : styles[style].dft, props.disabled ? styles[style].disabled : styles[style].dft,
]" ]"
:disabled="props.disabled" :disabled="props.disabled"
=======
:class="['inline-flex h-9 items-center justify-center rounded-md px-3 py-1.5 text-sm font-semibold leading-6 shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600 text-white bg-blue-600 hover:bg-blue-500 disabled:text-zinc-400 disabled:bg-blue-600/10 disabled:hover:bg-blue-600/10', props.class ?? '']"
>>>>>>> Stashed changes
> >
<div v-if="props.loading" role="status"> <div v-if="props.loading" role="status">
<svg <svg
@ -35,7 +31,6 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
<<<<<<< Updated upstream
type Style = "default" | "none"; type Style = "default" | "none";
const props = defineProps<{ const props = defineProps<{
loading: boolean; loading: boolean;
@ -56,7 +51,4 @@ const styles: {
}, },
["none"]: { base: "", dft: "", disabled: "" }, ["none"]: { base: "", dft: "", disabled: "" },
}; };
=======
const props = defineProps<{ loading: boolean, class?: string }>();
>>>>>>> Stashed changes
</script> </script>