From 9d5c6db7da796496a0ca747066feacee6d278071 Mon Sep 17 00:00:00 2001 From: Neshura Date: Mon, 1 Jan 2024 20:00:35 +0100 Subject: [PATCH] Prettier changes --- src/app.html | 6 +- src/app.pcss | 196 ++++++------- src/lib/components/Card.svelte | 150 ++++++---- src/lib/components/pages.json | 304 ++++++++++----------- src/lib/components/ui/button/button.svelte | 14 +- src/lib/components/ui/button/index.ts | 39 ++- src/lib/utils.ts | 88 +++--- src/routes/+layout.svelte | 2 +- src/routes/+page.svelte | 170 ++++++------ src/routes/Header.svelte | 92 ++++--- src/routes/services/+page.svelte | 21 +- 11 files changed, 556 insertions(+), 526 deletions(-) diff --git a/src/app.html b/src/app.html index b58746b..fdc4ace 100644 --- a/src/app.html +++ b/src/app.html @@ -7,9 +7,9 @@ %sveltekit.head%
%sveltekit.body%
diff --git a/src/app.pcss b/src/app.pcss index 17cd4bf..af880f0 100644 --- a/src/app.pcss +++ b/src/app.pcss @@ -1,115 +1,115 @@ @tailwind base; @tailwind components; @tailwind utilities; - + @layer base { - :root { - --background: 0 0% 100%; - --foreground: 222.2 84% 4.9%; - - --muted: 210 40% 96.1%; - --muted-foreground: 215.4 16.3% 46.9%; - - --popover: 0 0% 100%; - --popover-foreground: 222.2 84% 4.9%; - - --card: 0 0% 100%; - --card-foreground: 222.2 84% 4.9%; - - --border: 214.3 31.8% 91.4%; - --input: 214.3 31.8% 91.4%; - - --primary: 222.2 47.4% 11.2%; - --primary-foreground: 210 40% 98%; - - --secondary: 210 40% 96.1%; - --secondary-foreground: 222.2 47.4% 11.2%; - - --accent: 210 40% 96.1%; - --accent-foreground: 222.2 47.4% 11.2%; - - --destructive: 0 72.2% 50.6%; - --destructive-foreground: 210 40% 98%; - - --ring: 222.2 84% 4.9%; - - --radius: 0.5rem; - } - - .dark { - --background: 222.2 84% 4.9%; - --foreground: 210 40% 98%; - - --muted: 217.2 32.6% 17.5%; - --muted-foreground: 215 20.2% 65.1%; - - --popover: 222.2 84% 4.9%; - --popover-foreground: 210 40% 98%; - - --card: 222.2 84% 4.9%; - --card-foreground: 210 40% 98%; - - --border: 217.2 32.6% 17.5%; - --input: 217.2 32.6% 17.5%; - - --primary: 210 40% 98%; - --primary-foreground: 222.2 47.4% 11.2%; - - --secondary: 217.2 32.6% 17.5%; - --secondary-foreground: 210 40% 98%; - - --accent: 217.2 32.6% 17.5%; - --accent-foreground: 210 40% 98%; - - --destructive: 0 62.8% 30.6%; - --destructive-foreground: 210 40% 98%; - - --ring: hsl(212.7,26.8%,83.9); - } + :root { + --background: 0 0% 100%; + --foreground: 222.2 84% 4.9%; - .nordlys { - --background: 0 0% 0%; /* #000000 */ - --foreground: 173 80% 40%; /* #14b8a6 */ + --muted: 210 40% 96.1%; + --muted-foreground: 215.4 16.3% 46.9%; - --muted: 183 100% 96%; /* #ecfeff */ - --muted-foreground: 176 61% 19%; /* #134e4a */ + --popover: 0 0% 100%; + --popover-foreground: 222.2 84% 4.9%; - --popover: 0 0% 0%; /* #000000 */ - --popover-foreground: 173 80% 40%; /* #14b8a6 */ + --card: 0 0% 100%; + --card-foreground: 222.2 84% 4.9%; - --card: 0 0% 0%; /* #000000 */ - --card-foreground: 173 80% 40%; /* #14b8a6 */ + --border: 214.3 31.8% 91.4%; + --input: 214.3 31.8% 91.4%; - --border: 183 100% 96%; /* #ecfeff */ - --input: 183 100% 96%; /* #ecfeff */ + --primary: 222.2 47.4% 11.2%; + --primary-foreground: 210 40% 98%; - --primary: 173 80% 40%; /* #14b8a6 */ - --primary-foreground: 221 39% 11%; /* #111827 */ + --secondary: 210 40% 96.1%; + --secondary-foreground: 222.2 47.4% 11.2%; - --secondary: 183 100% 96%; /* #ecfeff */ - --secondary-foreground: 173 80% 40%; /* #14b8a6 */ + --accent: 210 40% 96.1%; + --accent-foreground: 222.2 47.4% 11.2%; - --accent: 183 100% 96%; /* #ecfeff */ - --accent-foreground: 173 80% 40%; /* #14b8a6 */ + --destructive: 0 72.2% 50.6%; + --destructive-foreground: 210 40% 98%; - --destructive: 0 70% 35%; /* #991b1b */ - --destructive-foreground: 173 80% 40%; /* #14b8a6 */ + --ring: 222.2 84% 4.9%; - --offline: var(--destructive); - --online: 142 76% 36%; /* #16a34a */ - --pending: 25 95% 53%; /* #f97316 */ - --maintenance: 224 76% 48%; /* #1d4ed8 */ + --radius: 0.5rem; + } - /* that border thingy when you tab through stuff */ - --ring: hsl(168 84% 78%); /* #99f6e4 */ - } + .dark { + --background: 222.2 84% 4.9%; + --foreground: 210 40% 98%; + + --muted: 217.2 32.6% 17.5%; + --muted-foreground: 215 20.2% 65.1%; + + --popover: 222.2 84% 4.9%; + --popover-foreground: 210 40% 98%; + + --card: 222.2 84% 4.9%; + --card-foreground: 210 40% 98%; + + --border: 217.2 32.6% 17.5%; + --input: 217.2 32.6% 17.5%; + + --primary: 210 40% 98%; + --primary-foreground: 222.2 47.4% 11.2%; + + --secondary: 217.2 32.6% 17.5%; + --secondary-foreground: 210 40% 98%; + + --accent: 217.2 32.6% 17.5%; + --accent-foreground: 210 40% 98%; + + --destructive: 0 62.8% 30.6%; + --destructive-foreground: 210 40% 98%; + + --ring: hsl(212.7, 26.8%, 83.9); + } + + .nordlys { + --background: 0 0% 0%; /* #000000 */ + --foreground: 173 80% 40%; /* #14b8a6 */ + + --muted: 183 100% 96%; /* #ecfeff */ + --muted-foreground: 176 61% 19%; /* #134e4a */ + + --popover: 0 0% 0%; /* #000000 */ + --popover-foreground: 173 80% 40%; /* #14b8a6 */ + + --card: 0 0% 0%; /* #000000 */ + --card-foreground: 173 80% 40%; /* #14b8a6 */ + + --border: 183 100% 96%; /* #ecfeff */ + --input: 183 100% 96%; /* #ecfeff */ + + --primary: 173 80% 40%; /* #14b8a6 */ + --primary-foreground: 221 39% 11%; /* #111827 */ + + --secondary: 183 100% 96%; /* #ecfeff */ + --secondary-foreground: 173 80% 40%; /* #14b8a6 */ + + --accent: 183 100% 96%; /* #ecfeff */ + --accent-foreground: 173 80% 40%; /* #14b8a6 */ + + --destructive: 0 70% 35%; /* #991b1b */ + --destructive-foreground: 173 80% 40%; /* #14b8a6 */ + + --offline: var(--destructive); + --online: 142 76% 36%; /* #16a34a */ + --pending: 25 95% 53%; /* #f97316 */ + --maintenance: 224 76% 48%; /* #1d4ed8 */ + + /* that border thingy when you tab through stuff */ + --ring: hsl(168 84% 78%); /* #99f6e4 */ + } } - + @layer base { - * { - @apply border-border; - } - body { - @apply bg-background text-foreground; - } -} \ No newline at end of file + * { + @apply border-border; + } + body { + @apply bg-background text-foreground; + } +} diff --git a/src/lib/components/Card.svelte b/src/lib/components/Card.svelte index ed87273..bf83be5 100644 --- a/src/lib/components/Card.svelte +++ b/src/lib/components/Card.svelte @@ -1,66 +1,100 @@ -
-
-
hover.title = true} on:mouseleave={() => hover.title = false}> - {#if service.icon} - {service.name} Logo - {:else} - {/if} - {service.name} - {#if hover.title} -
- -
- {/if} -
+
+
+
(hover.title = true)} + on:mouseleave={() => (hover.title = false)} + > + {#if service.icon} + {service.name} Logo + {:else}{/if} + {service.name} + {#if hover.title} +
+ +
+ {/if} +
-

Loading

-
-

{service.desc}

-

{service.warn}

-
- hover.link = true} - on:mouseleave={() => hover.link = false} - > - Open - {#if hover.link} -
- -
- {/if} - - {#if service.extLink} - hover.ext = true} - on:mouseleave={() => hover.ext = false} - > - Official Site - {#if hover.ext} -
- -
- {/if} - - {/if} -
-
\ No newline at end of file +

+ Loading +

+
+

{service.desc}

+

{service.warn}

+
+ (hover.link = true)} + on:mouseleave={() => (hover.link = false)} + > + Open + {#if hover.link} +
+ +
+ {/if} + + {#if service.extLink} + (hover.ext = true)} + on:mouseleave={() => (hover.ext = false)} + > + Official Site + {#if hover.ext} +
+ +
+ {/if} + + {/if} +
+
diff --git a/src/lib/components/pages.json b/src/lib/components/pages.json index 3480b7b..1f31314 100644 --- a/src/lib/components/pages.json +++ b/src/lib/components/pages.json @@ -1,155 +1,155 @@ { - "services": [ - { - "name": "Nextcloud", - "icon": "/assets/icons/nextcloud-logo.svg", - "href": "https://nextcloud.neshweb.net/", - "desc": "Self-hosted Cloud Storage Service", - "warn": "Note: Registration requires approval", - "extLink": "https://nextcloud.com/", - "id": 7 - }, - { - "name": "Kavita", - "icon": "/assets/icons/kavita-logo.svg", - "href": "https://kavita.neshweb.net", - "desc": "Self-hosted Manga Library", - "warn": "Registration via Admin invite", - "id": 5 - }, - { - "name": "Images", - "icon": "/assets/icons/images-logo.svg", - "href": "https://imgs.neshweb.net/", - "desc": "Self-hosted Chevereto Image Service", - "warn": "", - "extLink": "https://chevereto.com/", - "id": 4 - }, - { - "name": "Calibre Web", - "icon": "/assets/icons/calibre-logo.avif", - "href": "https://calibre.neshweb.net/", - "desc": "Self-hosted Ebook Library Service", - "warn": "Note: Registration only via Admin", - "id": 6 - }, - { - "name": "PeerTube", - "icon": "/assets/icons/peertube-logo.svg", - "href": "https://tube.neshweb.net/", - "desc": "Self-hosted PeerTube Instance", - "warn": "Note: Registration only via Admin", - "id": 8 - }, - { - "name": "Mastodon", - "icon": "/assets/icons/mastodon-logo.svg", - "href": "https://mastodon.neshweb.net/", - "desc": "Self-hosted Mastodon Instance", - "warn": "Note: Registration requires approval", - "id": 3 - }, + "services": [ + { + "name": "Nextcloud", + "icon": "/assets/icons/nextcloud-logo.svg", + "href": "https://nextcloud.neshweb.net/", + "desc": "Self-hosted Cloud Storage Service", + "warn": "Note: Registration requires approval", + "extLink": "https://nextcloud.com/", + "id": 7 + }, + { + "name": "Kavita", + "icon": "/assets/icons/kavita-logo.svg", + "href": "https://kavita.neshweb.net", + "desc": "Self-hosted Manga Library", + "warn": "Registration via Admin invite", + "id": 5 + }, + { + "name": "Images", + "icon": "/assets/icons/images-logo.svg", + "href": "https://imgs.neshweb.net/", + "desc": "Self-hosted Chevereto Image Service", + "warn": "", + "extLink": "https://chevereto.com/", + "id": 4 + }, + { + "name": "Calibre Web", + "icon": "/assets/icons/calibre-logo.avif", + "href": "https://calibre.neshweb.net/", + "desc": "Self-hosted Ebook Library Service", + "warn": "Note: Registration only via Admin", + "id": 6 + }, + { + "name": "PeerTube", + "icon": "/assets/icons/peertube-logo.svg", + "href": "https://tube.neshweb.net/", + "desc": "Self-hosted PeerTube Instance", + "warn": "Note: Registration only via Admin", + "id": 8 + }, + { + "name": "Mastodon", + "icon": "/assets/icons/mastodon-logo.svg", + "href": "https://mastodon.neshweb.net/", + "desc": "Self-hosted Mastodon Instance", + "warn": "Note: Registration requires approval", + "id": 3 + }, - { - "name": "Vaultwarden", - "icon": "/assets/icons/vaultwarden-logo.svg", - "href": "https://vault.neshweb.net", - "desc": "Self-hosted Password Manager", - "warn": "Note: Invite only", - "id": 9 - }, - { - "name": "Jellyfin", - "icon": "/assets/icons/jellyfin-logo.svg", - "href": "https://jellyfin.neshweb.net/", - "desc": "Open-Source, Self-Hosted Media Platform", - "warn": "Note: Registration only via Admin", - "id": 37 - }, - { - "name": "Navidrome", - "icon": "/assets/icons/navidrome-logo.avif", - "href": "https://navidrome.neshweb.net/", - "desc": "Open-Source, Self-Hosted Music Streaming Platform", - "warn": "Note: Registration only via Admin", - "id": 10 - }, - { - "name": "Gitlab", - "icon": "/assets/icons/gitlab-logo.svg", - "href": "https://gitlab.neshweb.net/", - "desc": "Self-hosted Git Service", - "warn": "Note: Registration only via Admin", - "id": 2 - }, - { - "name": "Forgejo", - "icon": "/assets/icons/forgejo-logo.svg", - "href": "https://forgejo.neshweb.net/", - "desc": "Self-hosted Git Service", - "warn": "Note: Registration only via Admin", - "id": 36 - }, - { - "name": "Portainer", - "icon": "/assets/icons/portainer-logo.avif", - "href": "https://portainer.neshweb.net/", - "desc": "Docker Container Manager", - "warn": "Note: Admin Only", - "id": 34 - }, - { - "name": "Nginx", - "icon": "/assets/icons/npm-logo.avif", - "href": "https://nginx.neshweb.net/", - "desc": "Web-based Nginx Proxy Manager", - "warn": "Note: Admin Only", - "id": 31 - }, - { - "name": "Proxmox", - "icon": "/assets/icons/proxmox-logo.avif", - "href": "https://proxmox.neshweb.net/", - "desc": "Hypervisor Webinterface", - "warn": "Note: Admin Only", - "id": 33 - }, - { - "name": "Dockge", - "icon": "/assets/icons/dockge-logo.avif", - "href": "https://dockge.neshweb.net/", - "desc": "Docker Compose WebUI", - "warn": "Note: Admin Only", - "id": 35 - } - ], - "games": { - "minecraft": { - "name": "Minecraft", - "icon": "/assets/icons/minecraft-logo.avif", - "href": "https://minecraft.neshweb.net/", - "desc": "View all currently available Minecraft Servers and their mods" - }, - "ready_or_not": { - "name": "Ready or Not", - "icon": "/assets/icons/ron-logo.avif", - "href": "https://readyornot.neshweb.net/", - "desc": "Collection of Floor Plans for the Game 'Ready or Not'" - }, - "zomboid": { - "name": "Zomboid", - "icon": "/assets/icons/zomboid-logo.avif", - "ip": "91.13.248.30", - "status": "Online" - }, - "factorio": { - "name": "Factorio", - "status": "Online" - }, - "space_engineers": { - "name": "Space Engineers", - "status": "Online" - } - } + { + "name": "Vaultwarden", + "icon": "/assets/icons/vaultwarden-logo.svg", + "href": "https://vault.neshweb.net", + "desc": "Self-hosted Password Manager", + "warn": "Note: Invite only", + "id": 9 + }, + { + "name": "Jellyfin", + "icon": "/assets/icons/jellyfin-logo.svg", + "href": "https://jellyfin.neshweb.net/", + "desc": "Open-Source, Self-Hosted Media Platform", + "warn": "Note: Registration only via Admin", + "id": 37 + }, + { + "name": "Navidrome", + "icon": "/assets/icons/navidrome-logo.avif", + "href": "https://navidrome.neshweb.net/", + "desc": "Open-Source, Self-Hosted Music Streaming Platform", + "warn": "Note: Registration only via Admin", + "id": 10 + }, + { + "name": "Gitlab", + "icon": "/assets/icons/gitlab-logo.svg", + "href": "https://gitlab.neshweb.net/", + "desc": "Self-hosted Git Service", + "warn": "Note: Registration only via Admin", + "id": 2 + }, + { + "name": "Forgejo", + "icon": "/assets/icons/forgejo-logo.svg", + "href": "https://forgejo.neshweb.net/", + "desc": "Self-hosted Git Service", + "warn": "Note: Registration only via Admin", + "id": 36 + }, + { + "name": "Portainer", + "icon": "/assets/icons/portainer-logo.avif", + "href": "https://portainer.neshweb.net/", + "desc": "Docker Container Manager", + "warn": "Note: Admin Only", + "id": 34 + }, + { + "name": "Nginx", + "icon": "/assets/icons/npm-logo.avif", + "href": "https://nginx.neshweb.net/", + "desc": "Web-based Nginx Proxy Manager", + "warn": "Note: Admin Only", + "id": 31 + }, + { + "name": "Proxmox", + "icon": "/assets/icons/proxmox-logo.avif", + "href": "https://proxmox.neshweb.net/", + "desc": "Hypervisor Webinterface", + "warn": "Note: Admin Only", + "id": 33 + }, + { + "name": "Dockge", + "icon": "/assets/icons/dockge-logo.avif", + "href": "https://dockge.neshweb.net/", + "desc": "Docker Compose WebUI", + "warn": "Note: Admin Only", + "id": 35 + } + ], + "games": { + "minecraft": { + "name": "Minecraft", + "icon": "/assets/icons/minecraft-logo.avif", + "href": "https://minecraft.neshweb.net/", + "desc": "View all currently available Minecraft Servers and their mods" + }, + "ready_or_not": { + "name": "Ready or Not", + "icon": "/assets/icons/ron-logo.avif", + "href": "https://readyornot.neshweb.net/", + "desc": "Collection of Floor Plans for the Game 'Ready or Not'" + }, + "zomboid": { + "name": "Zomboid", + "icon": "/assets/icons/zomboid-logo.avif", + "ip": "91.13.248.30", + "status": "Online" + }, + "factorio": { + "name": "Factorio", + "status": "Online" + }, + "space_engineers": { + "name": "Space Engineers", + "status": "Online" + } + } } diff --git a/src/lib/components/ui/button/button.svelte b/src/lib/components/ui/button/button.svelte index a128f14..fb61a87 100644 --- a/src/lib/components/ui/button/button.svelte +++ b/src/lib/components/ui/button/button.svelte @@ -1,15 +1,15 @@ diff --git a/src/lib/components/ui/button/index.ts b/src/lib/components/ui/button/index.ts index 9787e3e..e300752 100644 --- a/src/lib/components/ui/button/index.ts +++ b/src/lib/components/ui/button/index.ts @@ -1,37 +1,34 @@ -import type { Button as ButtonPrimitive } from "bits-ui"; -import { tv, type VariantProps } from "tailwind-variants"; -import Root from "./button.svelte"; +import type { Button as ButtonPrimitive } from 'bits-ui'; +import { tv, type VariantProps } from 'tailwind-variants'; +import Root from './button.svelte'; const buttonVariants = tv({ - base: "inline-flex items-center justify-center rounded-md text-sm font-medium whitespace-nowrap transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50", + base: 'inline-flex items-center justify-center rounded-md text-sm font-medium whitespace-nowrap transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50', variants: { variant: { - default: - "bg-primary text-primary-foreground shadow hover:bg-primary/90", - destructive: - "bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90", + default: 'bg-primary text-primary-foreground shadow hover:bg-primary/90', + destructive: 'bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90', outline: - "border border-input bg-transparent shadow-sm hover:bg-accent hover:text-accent-foreground", - secondary: - "bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80", - ghost: "hover:bg-accent hover:text-accent-foreground", - link: "text-primary underline-offset-4 hover:underline" + 'border border-input bg-transparent shadow-sm hover:bg-accent hover:text-accent-foreground', + secondary: 'bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80', + ghost: 'hover:bg-accent hover:text-accent-foreground', + link: 'text-primary underline-offset-4 hover:underline' }, size: { - default: "h-9 px-4 py-2", - sm: "h-8 rounded-md px-3 text-xs", - lg: "h-10 rounded-md px-8", - icon: "h-9 w-9" + default: 'h-9 px-4 py-2', + sm: 'h-8 rounded-md px-3 text-xs', + lg: 'h-10 rounded-md px-8', + icon: 'h-9 w-9' } }, defaultVariants: { - variant: "default", - size: "default" + variant: 'default', + size: 'default' } }); -type Variant = VariantProps["variant"]; -type Size = VariantProps["size"]; +type Variant = VariantProps['variant']; +type Size = VariantProps['size']; type Props = ButtonPrimitive.Props & { variant?: Variant; diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 230a1fb..eba19d8 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -1,62 +1,56 @@ -import { type ClassValue, clsx } from "clsx"; -import { twMerge } from "tailwind-merge"; -import { cubicOut } from "svelte/easing"; -import type { TransitionConfig } from "svelte/transition"; +import { type ClassValue, clsx } from 'clsx'; +import { twMerge } from 'tailwind-merge'; +import { cubicOut } from 'svelte/easing'; +import type { TransitionConfig } from 'svelte/transition'; export function cn(...inputs: ClassValue[]) { - return twMerge(clsx(inputs)); + return twMerge(clsx(inputs)); } type FlyAndScaleParams = { - y?: number; - x?: number; - start?: number; - duration?: number; + y?: number; + x?: number; + start?: number; + duration?: number; }; export const flyAndScale = ( - node: Element, - params: FlyAndScaleParams = { y: -8, x: 0, start: 0.95, duration: 150 } + node: Element, + params: FlyAndScaleParams = { y: -8, x: 0, start: 0.95, duration: 150 } ): TransitionConfig => { - const style = getComputedStyle(node); - const transform = style.transform === "none" ? "" : style.transform; + const style = getComputedStyle(node); + const transform = style.transform === 'none' ? '' : style.transform; - const scaleConversion = ( - valueA: number, - scaleA: [number, number], - scaleB: [number, number] - ) => { - const [minA, maxA] = scaleA; - const [minB, maxB] = scaleB; + const scaleConversion = (valueA: number, scaleA: [number, number], scaleB: [number, number]) => { + const [minA, maxA] = scaleA; + const [minB, maxB] = scaleB; - const percentage = (valueA - minA) / (maxA - minA); - const valueB = percentage * (maxB - minB) + minB; + const percentage = (valueA - minA) / (maxA - minA); + const valueB = percentage * (maxB - minB) + minB; - return valueB; - }; + return valueB; + }; - const styleToString = ( - style: Record - ): string => { - return Object.keys(style).reduce((str, key) => { - if (style[key] === undefined) return str; - return str + `${key}:${style[key]};`; - }, ""); - }; + const styleToString = (style: Record): string => { + return Object.keys(style).reduce((str, key) => { + if (style[key] === undefined) return str; + return str + `${key}:${style[key]};`; + }, ''); + }; - return { - duration: params.duration ?? 200, - delay: 0, - css: (t) => { - const y = scaleConversion(t, [0, 1], [params.y ?? 5, 0]); - const x = scaleConversion(t, [0, 1], [params.x ?? 0, 0]); - const scale = scaleConversion(t, [0, 1], [params.start ?? 0.95, 1]); + return { + duration: params.duration ?? 200, + delay: 0, + css: (t) => { + const y = scaleConversion(t, [0, 1], [params.y ?? 5, 0]); + const x = scaleConversion(t, [0, 1], [params.x ?? 0, 0]); + const scale = scaleConversion(t, [0, 1], [params.start ?? 0.95, 1]); - return styleToString({ - transform: `${transform} translate3d(${x}px, ${y}px, 0) scale(${scale})`, - opacity: t - }); - }, - easing: cubicOut - }; -}; \ No newline at end of file + return styleToString({ + transform: `${transform} translate3d(${x}px, ${y}px, 0) scale(${scale})`, + opacity: t + }); + }, + easing: cubicOut + }; +}; diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index e06dda3..fc033f6 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,6 +1,6 @@
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index f2812b0..d27d732 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,86 +1,86 @@ -
-

Welcome to SvelteKit

-

Visit kit.svelte.dev to read the documentation

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

-

gap

+
+

Welcome to SvelteKit

+

Visit kit.svelte.dev to read the documentation

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

+

gap

diff --git a/src/routes/Header.svelte b/src/routes/Header.svelte index ce1b31f..9df72b2 100644 --- a/src/routes/Header.svelte +++ b/src/routes/Header.svelte @@ -1,47 +1,53 @@ - -
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
\ No newline at end of file +
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
diff --git a/src/routes/services/+page.svelte b/src/routes/services/+page.svelte index 55fe752..6c5211d 100644 --- a/src/routes/services/+page.svelte +++ b/src/routes/services/+page.svelte @@ -1,20 +1,19 @@ - Services - + Services + - -
- {#each services as service} - - {/each} -
\ No newline at end of file +
+ {#each services as service} + + {/each} +