Skip to content

Commit 82626fe

Browse files
authored
Merge pull request #21 from rema424/rema424-patch-1
chore: ensure proper Tailwind formatting & improve consistency
2 parents 6455989 + 3d37555 commit 82626fe

31 files changed

+517
-238
lines changed

stubs/inertia-svelte-ts/resources/js/Components/Modal.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@
5656

5757
{#if show}
5858
<div bind:this={dialog} style:display={show ? 'contents' : 'none'}>
59-
<div class="fixed inset-0 z-50 px-4 py-6 overflow-y-auto sm:px-0" scroll-region>
59+
<div class="fixed inset-0 z-50 overflow-y-auto px-4 py-6 sm:px-0" scroll-region>
6060
<div
6161
in:fade={{ duration: 300, easing: cubicOut }}
6262
out:fade={{ duration: 200, easing: cubicIn }}
6363
>
6464
<!-- svelte-ignore a11y_consider_explicit_label -->
65-
<button class="fixed inset-0 transition-all transform-select-none" onclick={close}>
65+
<button class="transform-select-none fixed inset-0 transition-all" onclick={close}>
6666
<div class="absolute inset-0 bg-gray-500 opacity-75 dark:bg-gray-900">
6767
&nbsp;
6868
</div>
@@ -74,7 +74,7 @@
7474
out:fade={{ duration: 200, easing: cubicIn }}
7575
>
7676
<div
77-
class="mb-6 bg-white dark:bg-gray-800 rounded-lg overflow-hidden shadow-xl transform transition-all sm:w-full sm:mx-auto {maxWidthClass}"
77+
class="mb-6 transform overflow-hidden rounded-lg bg-white shadow-xl transition-all sm:mx-auto sm:w-full dark:bg-gray-800 {maxWidthClass}"
7878
>
7979
{@render children()}
8080
</div>

stubs/inertia-svelte-ts/resources/js/Components/NavLink.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<Link
1616
{...attrs}
1717
class={active
18-
? 'inline-flex items-center px-1 pt-1 border-b-2 border-indigo-400 dark:border-indigo-600 text-sm font-medium leading-5 text-gray-900 dark:text-gray-100 focus:outline-none focus:border-indigo-700 transition duration-150 ease-in-out'
19-
: 'inline-flex items-center px-1 pt-1 border-b-2 border-transparent text-sm font-medium leading-5 text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300 hover:border-gray-300 dark:hover:border-gray-700 focus:outline-none focus:text-gray-700 dark:focus:text-gray-300 focus:border-gray-300 dark:focus:border-gray-700 transition duration-150 ease-in-out'}
18+
? 'inline-flex items-center border-b-2 border-indigo-400 px-1 pt-1 text-sm font-medium leading-5 text-gray-900 transition duration-150 ease-in-out focus:border-indigo-700 focus:outline-none dark:border-indigo-600 dark:text-gray-100'
19+
: 'inline-flex items-center border-b-2 border-transparent px-1 pt-1 text-sm font-medium leading-5 text-gray-500 transition duration-150 ease-in-out hover:border-gray-300 hover:text-gray-700 focus:border-gray-300 focus:text-gray-700 focus:outline-none dark:text-gray-400 dark:hover:border-gray-700 dark:hover:text-gray-300 dark:focus:border-gray-700 dark:focus:text-gray-300'}
2020
>
2121
{@render children()}
2222
</Link>

stubs/inertia-svelte-ts/resources/js/Layouts/AuthenticatedLayout.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
<div class="min-h-screen bg-gray-100 dark:bg-gray-900">
1717
<nav class="border-b border-gray-100 bg-white dark:border-gray-700 dark:bg-gray-800">
1818
<!-- Primary Navigation Menu -->
19-
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
19+
<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
2020
<div class="flex h-16 justify-between">
2121
<div class="flex">
2222
<!-- Logo -->
23-
<div class="shrink-0 flex items-center">
23+
<div class="flex shrink-0 items-center">
2424
<a use:inertia href={route('dashboard')}>
2525
<ApplicationLogo
2626
class="block h-9 w-auto fill-current text-gray-800 dark:text-gray-200"
@@ -135,7 +135,7 @@
135135

136136
<!-- Page Heading -->
137137
{#if header}
138-
<header class="bg-white dark:bg-gray-800 shadow">
138+
<header class="bg-white shadow dark:bg-gray-800">
139139
<div class="mx-auto max-w-7xl px-4 py-6 sm:px-6 lg:px-8">
140140
{@render header()}
141141
</div>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import axios from 'axios';
2-
window.axios = axios
2+
window.axios = axios;
33

4-
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'
4+
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';

stubs/inertia-svelte/.prettierrc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"trailingComma": "none",
44
"printWidth": 100,
55
"plugins": [
6+
"prettier-plugin-svelte",
67
"prettier-plugin-organize-imports",
7-
"prettier-plugin-tailwindcss",
8-
"prettier-plugin-svelte"
8+
"prettier-plugin-tailwindcss"
99
],
1010
"overrides": [
1111
{
@@ -15,4 +15,4 @@
1515
}
1616
}
1717
]
18-
}
18+
}

stubs/inertia-svelte/resources/js/Components/ApplicationLogo.svelte

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@
33
</script>
44

55
<svg viewBox="0 0 316 316" xmlns="http://www.w3.org/2000/svg" {...attrs}>
6-
<path d="M305.8 81.125C305.77 80.995 305.69 80.885 305.65 80.755C305.56 80.525 305.49 80.285 305.37 80.075C305.29 79.935 305.17 79.815 305.07 79.685C304.94 79.515 304.83 79.325 304.68 79.175C304.55 79.045 304.39 78.955 304.25 78.845C304.09 78.715 303.95 78.575 303.77 78.475L251.32 48.275C249.97 47.495 248.31 47.495 246.96 48.275L194.51 78.475C194.33 78.575 194.19 78.725 194.03 78.845C193.89 78.955 193.73 79.045 193.6 79.175C193.45 79.325 193.34 79.515 193.21 79.685C193.11 79.815 192.99 79.935 192.91 80.075C192.79 80.285 192.71 80.525 192.63 80.755C192.58 80.875 192.51 80.995 192.48 81.125C192.38 81.495 192.33 81.875 192.33 82.265V139.625L148.62 164.795V52.575C148.62 52.185 148.57 51.805 148.47 51.435C148.44 51.305 148.36 51.195 148.32 51.065C148.23 50.835 148.16 50.595 148.04 50.385C147.96 50.245 147.84 50.125 147.74 49.995C147.61 49.825 147.5 49.635 147.35 49.485C147.22 49.355 147.06 49.265 146.92 49.155C146.76 49.025 146.62 48.885 146.44 48.785L93.99 18.585C92.64 17.805 90.98 17.805 89.63 18.585L37.18 48.785C37 48.885 36.86 49.035 36.7 49.155C36.56 49.265 36.4 49.355 36.27 49.485C36.12 49.635 36.01 49.825 35.88 49.995C35.78 50.125 35.66 50.245 35.58 50.385C35.46 50.595 35.38 50.835 35.3 51.065C35.25 51.185 35.18 51.305 35.15 51.435C35.05 51.805 35 52.185 35 52.575V232.235C35 233.795 35.84 235.245 37.19 236.025L142.1 296.425C142.33 296.555 142.58 296.635 142.82 296.725C142.93 296.765 143.04 296.835 143.16 296.865C143.53 296.965 143.9 297.015 144.28 297.015C144.66 297.015 145.03 296.965 145.4 296.865C145.5 296.835 145.59 296.775 145.69 296.745C145.95 296.655 146.21 296.565 146.45 296.435L251.36 236.035C252.72 235.255 253.55 233.815 253.55 232.245V174.885L303.81 145.945C305.17 145.165 306 143.725 306 142.155V82.265C305.95 81.875 305.89 81.495 305.8 81.125ZM144.2 227.205L100.57 202.515L146.39 176.135L196.66 147.195L240.33 172.335L208.29 190.625L144.2 227.205ZM244.75 114.995V164.795L226.39 154.225L201.03 139.625V89.825L219.39 100.395L244.75 114.995ZM249.12 57.105L292.81 82.265L249.12 107.425L205.43 82.265L249.12 57.105ZM114.49 184.425L96.13 194.995V85.305L121.49 70.705L139.85 60.135V169.815L114.49 184.425ZM91.76 27.425L135.45 52.585L91.76 77.745L48.07 52.585L91.76 27.425ZM43.67 60.135L62.03 70.705L87.39 85.305V202.545V202.555V202.565C87.39 202.735 87.44 202.895 87.46 203.055C87.49 203.265 87.49 203.485 87.55 203.695V203.705C87.6 203.875 87.69 204.035 87.76 204.195C87.84 204.375 87.89 204.575 87.99 204.745C87.99 204.745 87.99 204.755 88 204.755C88.09 204.905 88.22 205.035 88.33 205.175C88.45 205.335 88.55 205.495 88.69 205.635L88.7 205.645C88.82 205.765 88.98 205.855 89.12 205.965C89.28 206.085 89.42 206.225 89.59 206.325C89.6 206.325 89.6 206.325 89.61 206.335C89.62 206.335 89.62 206.345 89.63 206.345L139.87 234.775V285.065L43.67 229.705V60.135ZM244.75 229.705L148.58 285.075V234.775L219.8 194.115L244.75 179.875V229.705ZM297.2 139.625L253.49 164.795V114.995L278.85 100.395L297.21 89.825V139.625H297.2Z"/>
6+
<path
7+
d="M305.8 81.125C305.77 80.995 305.69 80.885 305.65 80.755C305.56 80.525 305.49 80.285 305.37 80.075C305.29 79.935 305.17 79.815 305.07 79.685C304.94 79.515 304.83 79.325 304.68 79.175C304.55 79.045 304.39 78.955 304.25 78.845C304.09 78.715 303.95 78.575 303.77 78.475L251.32 48.275C249.97 47.495 248.31 47.495 246.96 48.275L194.51 78.475C194.33 78.575 194.19 78.725 194.03 78.845C193.89 78.955 193.73 79.045 193.6 79.175C193.45 79.325 193.34 79.515 193.21 79.685C193.11 79.815 192.99 79.935 192.91 80.075C192.79 80.285 192.71 80.525 192.63 80.755C192.58 80.875 192.51 80.995 192.48 81.125C192.38 81.495 192.33 81.875 192.33 82.265V139.625L148.62 164.795V52.575C148.62 52.185 148.57 51.805 148.47 51.435C148.44 51.305 148.36 51.195 148.32 51.065C148.23 50.835 148.16 50.595 148.04 50.385C147.96 50.245 147.84 50.125 147.74 49.995C147.61 49.825 147.5 49.635 147.35 49.485C147.22 49.355 147.06 49.265 146.92 49.155C146.76 49.025 146.62 48.885 146.44 48.785L93.99 18.585C92.64 17.805 90.98 17.805 89.63 18.585L37.18 48.785C37 48.885 36.86 49.035 36.7 49.155C36.56 49.265 36.4 49.355 36.27 49.485C36.12 49.635 36.01 49.825 35.88 49.995C35.78 50.125 35.66 50.245 35.58 50.385C35.46 50.595 35.38 50.835 35.3 51.065C35.25 51.185 35.18 51.305 35.15 51.435C35.05 51.805 35 52.185 35 52.575V232.235C35 233.795 35.84 235.245 37.19 236.025L142.1 296.425C142.33 296.555 142.58 296.635 142.82 296.725C142.93 296.765 143.04 296.835 143.16 296.865C143.53 296.965 143.9 297.015 144.28 297.015C144.66 297.015 145.03 296.965 145.4 296.865C145.5 296.835 145.59 296.775 145.69 296.745C145.95 296.655 146.21 296.565 146.45 296.435L251.36 236.035C252.72 235.255 253.55 233.815 253.55 232.245V174.885L303.81 145.945C305.17 145.165 306 143.725 306 142.155V82.265C305.95 81.875 305.89 81.495 305.8 81.125ZM144.2 227.205L100.57 202.515L146.39 176.135L196.66 147.195L240.33 172.335L208.29 190.625L144.2 227.205ZM244.75 114.995V164.795L226.39 154.225L201.03 139.625V89.825L219.39 100.395L244.75 114.995ZM249.12 57.105L292.81 82.265L249.12 107.425L205.43 82.265L249.12 57.105ZM114.49 184.425L96.13 194.995V85.305L121.49 70.705L139.85 60.135V169.815L114.49 184.425ZM91.76 27.425L135.45 52.585L91.76 77.745L48.07 52.585L91.76 27.425ZM43.67 60.135L62.03 70.705L87.39 85.305V202.545V202.555V202.565C87.39 202.735 87.44 202.895 87.46 203.055C87.49 203.265 87.49 203.485 87.55 203.695V203.705C87.6 203.875 87.69 204.035 87.76 204.195C87.84 204.375 87.89 204.575 87.99 204.745C87.99 204.745 87.99 204.755 88 204.755C88.09 204.905 88.22 205.035 88.33 205.175C88.45 205.335 88.55 205.495 88.69 205.635L88.7 205.645C88.82 205.765 88.98 205.855 89.12 205.965C89.28 206.085 89.42 206.225 89.59 206.325C89.6 206.325 89.6 206.325 89.61 206.335C89.62 206.335 89.62 206.345 89.63 206.345L139.87 234.775V285.065L43.67 229.705V60.135ZM244.75 229.705L148.58 285.075V234.775L219.8 194.115L244.75 179.875V229.705ZM297.2 139.625L253.49 164.795V114.995L278.85 100.395L297.21 89.825V139.625H297.2Z"
8+
/>
79
</svg>

stubs/inertia-svelte/resources/js/Components/Checkbox.svelte

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22
let { checked = $bindable(false), class: className, ...attrs } = $props();
33
</script>
44

5-
<input {...attrs} type="checkbox" bind:checked class="rounded border-gray-300 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:border-gray-700 dark:bg-gray-900 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800 {className}"/>
5+
<input
6+
{...attrs}
7+
type="checkbox"
8+
bind:checked
9+
class="rounded border-gray-300 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:border-gray-700 dark:bg-gray-900 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800 {className}"
10+
/>

stubs/inertia-svelte/resources/js/Components/DangerButton.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
<button
66
{...attrs}
7-
class="inline-flex items-center rounded-md border border-transparent bg-red-600 px-4 py-2 text-xs font-semibold uppercase tracking-widest text-white transition duration-150 ease-in-out hover:bg-red-500 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2 active:bg-red-700 dark:focus:ring-offset-gray-800 {className}">
7+
class="inline-flex items-center rounded-md border border-transparent bg-red-600 px-4 py-2 text-xs font-semibold uppercase tracking-widest text-white transition duration-150 ease-in-out hover:bg-red-500 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2 active:bg-red-700 dark:focus:ring-offset-gray-800 {className}"
8+
>
89
{@render children()}
910
</button>

stubs/inertia-svelte/resources/js/Components/Dropdown.svelte

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
content,
77
contentClasses = 'py-1 bg-white dark:bg-gray-700',
88
trigger,
9-
width = '48',
9+
width = '48'
1010
} = $props();
1111
1212
let open = $state(false);
@@ -16,20 +16,16 @@
1616
? 'ltr:origin-top-left rtl:origin-top-right start-0'
1717
: align === 'right'
1818
? 'ltr:origin-top-right rtl:origin-top-left end-0'
19-
: 'origin-top',
20-
)
19+
: 'origin-top'
20+
);
2121
2222
function closeOnEscape(e) {
2323
if (open && e.key === 'Escape') {
24-
open = false
24+
open = false;
2525
}
2626
}
2727
28-
function enter(node, {
29-
delay = 0,
30-
duration = 200,
31-
easing = cubicOut
32-
}) {
28+
function enter(node, { delay = 0, duration = 200, easing = cubicOut }) {
3329
return {
3430
delay,
3531
duration,
@@ -38,14 +34,10 @@
3834
opacity: ${t};
3935
transform: scale(${0.95 + 0.05 * t});
4036
`
41-
}
37+
};
4238
}
4339
44-
function leave(node, {
45-
delay = 0,
46-
duration = 75,
47-
easing = cubicIn
48-
}) {
40+
function leave(node, { delay = 0, duration = 75, easing = cubicIn }) {
4941
return {
5042
delay,
5143
duration,
@@ -54,7 +46,7 @@
5446
opacity: ${t};
5547
transform: scale(${0.95 + 0.05 * t});
5648
`
57-
}
49+
};
5850
}
5951
</script>
6052

@@ -71,8 +63,10 @@
7163
{#if open}
7264
<div class="fixed inset-0 z-40" onclick={() => (open = false)}></div>
7365
<div in:enter out:leave>
74-
<div class="absolute z-50 mt-2 rounded-md shadow-lg {widthClass} {alignmentClasses}"
75-
onclick={() => (open = false)}>
66+
<div
67+
class="absolute z-50 mt-2 rounded-md shadow-lg {widthClass} {alignmentClasses}"
68+
onclick={() => (open = false)}
69+
>
7670
<div class="rounded-md ring-1 ring-black ring-opacity-5 {contentClasses}">
7771
{@render content()}
7872
</div>

stubs/inertia-svelte/resources/js/Components/InputError.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
{#if message}
66
<div {...attrs}>
7-
<p class="text-sm text-red-600 dark:text-red-400">{ message }</p>
7+
<p class="text-sm text-red-600 dark:text-red-400">{message}</p>
88
</div>
99
{/if}

0 commit comments

Comments
 (0)