misc: Change the way buttons are handled
This commit is contained in:
1 parent
d8ac0d807a
commit
e243848e17
30 files changed
+200
-137
No files matched your search
@@ -22,6 +22,7 @@
|
||||
"svelte": "^3.54.0",
|
||||
"svelte-check": "^3.0.1",
|
||||
"svelte-hero-icons": "^5.0.0",
|
||||
"tailwind-merge": "^1.14.0",
|
||||
"tailwindcss": "^3.3.2",
|
||||
"tslib": "^2.4.1",
|
||||
"typescript": "^5.0.0",
|
||||
|
||||
+1
-1
@@ -11,6 +11,6 @@
|
||||
%sveltekit.head%
|
||||
</head>
|
||||
<body data-sveltekit-preload-data="hover">
|
||||
<div style="display: contents; height: 100%">%sveltekit.body%</div>
|
||||
<div style="display: contents">%sveltekit.body%</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -108,8 +108,8 @@
|
||||
<Button
|
||||
disabled={loading.subscribing}
|
||||
loading={loading.subscribing}
|
||||
large
|
||||
color={Color.ghost}
|
||||
color="ghost"
|
||||
size="lg"
|
||||
on:click={subscribe}
|
||||
>
|
||||
{community_view.subscribed == 'Subscribed' ||
|
||||
@@ -120,8 +120,8 @@
|
||||
<Button
|
||||
disabled={loading.blocking}
|
||||
loading={loading.blocking}
|
||||
large
|
||||
color={Color.danger}
|
||||
color="danger"
|
||||
size="lg"
|
||||
on:click={block}
|
||||
>
|
||||
{community_view.blocked ? 'Unblock' : 'Block'}
|
||||
|
||||
@@ -1,43 +1,91 @@
|
||||
<script lang="ts">
|
||||
import { createEventDispatcher } from 'svelte'
|
||||
import { Color } from '$lib/ui/colors.js'
|
||||
import Loading from '$lib/components/ui/loader/Loading.svelte'
|
||||
import Spinner from '$lib/components/ui/loader/Spinner.svelte'
|
||||
|
||||
export let color: Color = Color.secondary
|
||||
type ButtonColor = keyof typeof buttonColor
|
||||
type ButtonSize = keyof typeof buttonSize
|
||||
type ButtonRoundness = keyof typeof buttonRoundness
|
||||
|
||||
const buttonColor = {
|
||||
primary: `border bg-black border-black text-white dark:bg-white
|
||||
dark:border-white dark:text-black hover:text-inherit hover:bg-transparent
|
||||
active:bg-black/10 active:dark:bg-white/10`,
|
||||
|
||||
secondary: 'bg-transparent hover:bg-slate-100 hover:dark:bg-zinc-800',
|
||||
|
||||
danger:
|
||||
'border border-red-500 bg-red-500 hover:text-red-500 hover:bg-transparent text-white',
|
||||
|
||||
ghost: `border border-slate-200 dark:border-zinc-800 hover:bg-slate-100 hover:dark:bg-zinc-800
|
||||
hover:border-slate-200 hover:dark:border-zinc-700`,
|
||||
|
||||
elevated: `bg-slate-100 dark:bg-zinc-800 border border-slate-200
|
||||
dark:border-zinc-700 hover:bg-slate-200 hover:dark:bg-zinc-700 hover:border-slate-300
|
||||
hover:dark:border-zinc-600`,
|
||||
|
||||
none: '',
|
||||
}
|
||||
|
||||
const buttonSize = {
|
||||
sm: 'px-3 py-1',
|
||||
md: 'px-3 py-1.5',
|
||||
lg: 'px-4 py-2',
|
||||
}
|
||||
|
||||
const buttonRoundness = {
|
||||
pill: 'rounded-full',
|
||||
md: 'rounded-md',
|
||||
none: '',
|
||||
}
|
||||
|
||||
export let loading = false
|
||||
export let large = false
|
||||
export let disabled = false
|
||||
export let submit = false
|
||||
export let label: string = ''
|
||||
export let spinner = false
|
||||
|
||||
export let color: ButtonColor = 'secondary'
|
||||
export let size: ButtonSize = 'md'
|
||||
export let rounded: ButtonRoundness = 'md'
|
||||
|
||||
const dispatch = createEventDispatcher()
|
||||
export let href: string | undefined = undefined
|
||||
|
||||
let buttonClass = `
|
||||
${buttonColor[color]}
|
||||
${buttonSize[size]}
|
||||
${buttonRoundness[rounded]}
|
||||
${
|
||||
loading ? (color == 'primary' ? '!bg-transparent !text-inherit' : '') : ''
|
||||
}
|
||||
text-sm transition-all disabled:opacity-70 disabled:pointer-events-none
|
||||
${$$props.class}
|
||||
`
|
||||
</script>
|
||||
|
||||
<button
|
||||
{disabled}
|
||||
on:click={(e) => dispatch('click', e)}
|
||||
class="{large
|
||||
? 'w-full px-4 py-2'
|
||||
: 'px-3 py-1.5'} rounded-md {color} text-sm transition-all disabled:opacity-50 disabled:pointer-events-none"
|
||||
type={submit ? 'submit' : 'button'}
|
||||
aria-label={label}
|
||||
>
|
||||
<div
|
||||
class="flex flex-row items-center justify-center gap-2"
|
||||
class:hidden={loading}
|
||||
>
|
||||
<slot name="icon" />
|
||||
<slot />
|
||||
</div>
|
||||
<div class="mx-auto" class:hidden={!loading}>
|
||||
{#if spinner}
|
||||
{#if href}
|
||||
<a {href} {...$$restProps} class={buttonClass}>
|
||||
<div class="flex flex-row items-center justify-center gap-1.5">
|
||||
{#if loading}
|
||||
<Spinner />
|
||||
{:else}
|
||||
<div class="py-2">
|
||||
<Loading />
|
||||
</div>
|
||||
<slot name="icon" />
|
||||
{/if}
|
||||
<slot />
|
||||
</div>
|
||||
</button>
|
||||
</a>
|
||||
{:else}
|
||||
<button
|
||||
disabled={loading}
|
||||
{...$$restProps}
|
||||
on:click={(e) => dispatch('click', e)}
|
||||
class={buttonClass}
|
||||
type={submit ? 'submit' : 'button'}
|
||||
>
|
||||
<div class="flex flex-row items-center justify-center gap-1.5">
|
||||
{#if loading}
|
||||
<Spinner width={20} />
|
||||
{:else}
|
||||
<slot name="icon" />
|
||||
{/if}
|
||||
<slot />
|
||||
</div>
|
||||
</button>
|
||||
{/if}
|
||||
@@ -15,9 +15,12 @@
|
||||
</script>
|
||||
|
||||
<label
|
||||
class="flex flex-col items-center px-8 py-4 mx-auto w-full rounded-lg border border-black border-dashed cursor-pointer min-h-36 transition-colors dark:border-white {dragover
|
||||
class="flex flex-col items-center px-8 py-4 mx-auto w-full rounded-lg
|
||||
border border-slate-300 dark:border-zinc-700 bg-white dark:bg-black
|
||||
cursor-pointer min-h-36 transition-colors {dragover
|
||||
? 'border-sky-500 text-sky-500'
|
||||
: ''}"
|
||||
: ''}
|
||||
"
|
||||
on:drop|preventDefault={(event) => (files = event.dataTransfer?.files)}
|
||||
on:dragover|preventDefault={(event) => {
|
||||
if (event.dataTransfer) {
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
<script lang="ts">
|
||||
import { Color } from '$lib/ui/colors.js'
|
||||
export let href: string
|
||||
|
||||
export let color: Color = Color.secondary
|
||||
export let href = ''
|
||||
export let label: string = ''
|
||||
export let highlight: boolean
|
||||
</script>
|
||||
|
||||
<a
|
||||
{href}
|
||||
class="px-3 py-1 rounded-md {color} flex flex-row items-center
|
||||
justify-center text-sm transition-all gap-1"
|
||||
aria-label={label}
|
||||
class="flex flex-row gap-2 {highlight ? 'text-sky-500' : ''} hover:underline"
|
||||
{...$$restProps}
|
||||
>
|
||||
<slot name="icon" />
|
||||
<slot />
|
||||
|
||||
@@ -27,8 +27,8 @@
|
||||
{placeholder}
|
||||
{maxlength}
|
||||
{rows}
|
||||
class="w-full px-3 text-sm py-2.5 bg-transparent border border-black/20
|
||||
dark:border-white/20 dark:focus:border-white focus:outline-none
|
||||
focus:border-black transition-colors rounded-md {clazz}"
|
||||
class="w-full px-3 text-sm py-2.5 bg-white dark:bg-black
|
||||
border border-slate-300 dark:border-zinc-700 dark:focus:border-white
|
||||
focus:outline-none focus:border-black transition-colors rounded-md {clazz}"
|
||||
/>
|
||||
</label>
|
||||
@@ -3,26 +3,26 @@
|
||||
|
||||
export let label: string = ''
|
||||
export let type: 'text' | 'password' | 'email' | null | undefined = 'text'
|
||||
export let placeholder: string = ''
|
||||
export let value: string = ''
|
||||
export let maxlength: number = -1
|
||||
export let required = false
|
||||
export let id = ''
|
||||
export let pattern: string | undefined = undefined
|
||||
export let minlength: number = 0
|
||||
|
||||
function typeAction(node: Node) {
|
||||
// @ts-ignore
|
||||
node.type = type
|
||||
}
|
||||
|
||||
let clazz = ''
|
||||
export { clazz as class }
|
||||
|
||||
const dispatcher = createEventDispatcher()
|
||||
|
||||
let className = `
|
||||
${value.length != 0 ? 'invalid:border-red-400' : ''}
|
||||
w-full px-3 text-sm py-2.5 bg-white dark:bg-zinc-950
|
||||
border border-slate-300 dark:border-zinc-700 dark:focus:border-white
|
||||
focus:outline-none focus:border-black transition-colors rounded-md
|
||||
${$$props.class}
|
||||
`
|
||||
</script>
|
||||
|
||||
<label class="flex flex-col items-center {clazz}">
|
||||
<label class="flex flex-col items-center {$$props.class}">
|
||||
{#if label != ''}
|
||||
<span
|
||||
class="font-bold text-sm text-left mb-1 cursor-pointer w-max self-start"
|
||||
@@ -38,16 +38,8 @@
|
||||
bind:value
|
||||
on:keydown={(e) => dispatcher('keydown', e)}
|
||||
on:input={(e) => dispatcher('input', e)}
|
||||
{placeholder}
|
||||
{maxlength}
|
||||
{minlength}
|
||||
{pattern}
|
||||
{id}
|
||||
class="{value.length != 0
|
||||
? 'invalid:border-red-400'
|
||||
: ''} w-full px-3 text-sm py-2.5 bg-transparent
|
||||
border border-black/20 dark:border-white/20 dark:focus:border-white
|
||||
focus:outline-none focus:border-black transition-colors rounded-md {clazz}"
|
||||
{...$$restProps}
|
||||
class={className}
|
||||
{required}
|
||||
/>
|
||||
</label>
|
||||
@@ -51,6 +51,7 @@
|
||||
<FormattedNumber number={site.counts.communities} />
|
||||
</span>
|
||||
</div>
|
||||
<p class="text-sm">{site.site.description}</p>
|
||||
<p>{site.site.description}</p>
|
||||
<hr class="border-slate-300 dark:border-zinc-700" />
|
||||
<Markdown source={site.site.sidebar} />
|
||||
</StickyCard>
|
||||
@@ -17,9 +17,7 @@
|
||||
</script>
|
||||
|
||||
<li
|
||||
class="py-2 {$page.url.hash == `#${node.comment_view.comment.id}`
|
||||
? 'bg-slate-200 dark:bg-zinc-800'
|
||||
: ''} {node.depth == 0
|
||||
class="py-2 {node.depth == 0
|
||||
? 'border-b border-slate-200 dark:border-zinc-800'
|
||||
: ''}"
|
||||
id="#{node.comment_view.comment.id.toString()}"
|
||||
@@ -83,7 +81,7 @@
|
||||
node.children = [
|
||||
{
|
||||
children: [],
|
||||
depth: node.depth,
|
||||
depth: node.depth + 1,
|
||||
comment_view: e.detail.comment_view,
|
||||
},
|
||||
...node.children,
|
||||
|
||||
@@ -55,15 +55,14 @@
|
||||
class="bg-slate-100 dark:bg-zinc-900"
|
||||
bind:value={newComment}
|
||||
/>
|
||||
<div
|
||||
class="w-full ml-auto flex flex-row gap-2 md:w-24 md:absolute md:bottom-0 md:right-0 md:m-2"
|
||||
>
|
||||
<div class="sm:ml-auto sm:w-28">
|
||||
<Button
|
||||
large
|
||||
on:click={submit}
|
||||
color={Color.accent}
|
||||
color="primary"
|
||||
size="lg"
|
||||
class="w-full"
|
||||
{loading}
|
||||
disabled={loading}
|
||||
>
|
||||
Submit
|
||||
</Button>
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
if (isParent && $page.url.hash) {
|
||||
document.getElementById($page.url.hash)?.scrollIntoView({
|
||||
behavior: 'smooth',
|
||||
block: 'center',
|
||||
})
|
||||
}
|
||||
})
|
||||
@@ -80,7 +81,7 @@
|
||||
disabled={loadingChildren}
|
||||
on:click={() => fetchChildren(node)}
|
||||
>
|
||||
<Icon src={ChevronDown} width={16} mini />
|
||||
<Icon src={ChevronDown} width={16} mini slot="icon" />
|
||||
{node.comment_view.counts.child_count} more
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
@@ -62,13 +62,23 @@
|
||||
<div class="flex flex-row gap-2 items-center">
|
||||
<PostVote post={post.post} vote={post.my_vote} score={post.counts.score} />
|
||||
|
||||
<Link color={Color.border} href="/post/{getInstance()}/{post.post.id}">
|
||||
<Button
|
||||
color="elevated"
|
||||
size="sm"
|
||||
href="/post/{getInstance()}/{post.post.id}"
|
||||
>
|
||||
<Icon slot="icon" src={ChatBubbleOvalLeft} mini width={16} height={16} />
|
||||
<FormattedNumber number={post.counts.comments} />
|
||||
</Link>
|
||||
</Button>
|
||||
<Menu alignment="bottom-right" class="ml-auto overflow-auto" let:toggleOpen>
|
||||
<Button slot="button" label="Post actions" on:click={toggleOpen}>
|
||||
<Icon src={EllipsisHorizontal} width={16} mini />
|
||||
<Button
|
||||
slot="button"
|
||||
label="Post actions"
|
||||
on:click={toggleOpen}
|
||||
class="!p-1.5"
|
||||
color="secondary"
|
||||
>
|
||||
<Icon slot="icon" src={EllipsisHorizontal} width={16} mini />
|
||||
</Button>
|
||||
<li class="mx-4 text-xs opacity-80 text-left my-1 py-1">Creator</li>
|
||||
<MenuButton
|
||||
|
||||
@@ -10,13 +10,15 @@
|
||||
<!-- svelte-ignore a11y-missing-attribute -->
|
||||
<img
|
||||
src={thumbnail_url}
|
||||
class="rounded-md max-h-[16rem] w-full aspect-[16/9] object-cover"
|
||||
class="rounded-md max-h-[16rem] w-full aspect-[16/9] object-cover bg-slate-200 dark:bg-zinc-800"
|
||||
width={600}
|
||||
height={400}
|
||||
/>
|
||||
<span
|
||||
class="w-full px-4 py-2 overflow-hidden
|
||||
whitespace-nowrap text-ellipsis text-sm group-hover:underline bg-slate-100 border
|
||||
dark:border-zinc-700
|
||||
dark:bg-zinc-800 absolute bottom-0 rounded-b-md flex flex-row gap-1 items-center h-10"
|
||||
class="w-full px-4 py-2 overflow-hidden whitespace-nowrap text-ellipsis
|
||||
text-sm group-hover:underline bg-slate-100 border dark:border-zinc-700
|
||||
dark:bg-zinc-800 absolute bottom-0 rounded-b-md flex flex-row gap-1
|
||||
items-center h-10"
|
||||
>
|
||||
<Icon src={Link} width={16} mini />
|
||||
{new URL(url).hostname}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Button from '$lib/components/input/Button.svelte'
|
||||
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
|
||||
import { authData, getClient } from '$lib/lemmy'
|
||||
import { userSettings } from '$lib/settings.js'
|
||||
@@ -65,8 +66,7 @@
|
||||
|
||||
<slot {upvote} {downvote} {vote} {score}>
|
||||
<div
|
||||
class="{Color.border} text-sm gap-0.5 rounded-md flex flex-row items-center px-1
|
||||
py-0.5
|
||||
class="{Color.border} text-sm gap-0.5 rounded-md flex flex-row items-center
|
||||
transition-colors cursor-pointer bg-slate-100 dark:bg-zinc-800
|
||||
hover:bg-slate-200 dark:hover:bg-zinc-700"
|
||||
>
|
||||
@@ -74,7 +74,7 @@
|
||||
aria-label="Upvote"
|
||||
class:text-orange-500={vote == 1 && $userSettings.revertColors}
|
||||
class:text-blue-500={vote == 1 && !$userSettings.revertColors}
|
||||
class="p-0.5 px-1"
|
||||
class="py-1 pr-0.5 pl-2"
|
||||
on:click={upvote}
|
||||
>
|
||||
<Icon src={ChevronUp} mini width={20} height={20} />
|
||||
@@ -84,7 +84,7 @@
|
||||
aria-label="Downvote"
|
||||
class:text-blue-500={vote == -1 && $userSettings.revertColors}
|
||||
class:text-red-500={vote == -1 && !$userSettings.revertColors}
|
||||
class="p-0.5 px-1"
|
||||
class="py-1 pl-0.5 pr-2"
|
||||
on:click={downvote}
|
||||
>
|
||||
<Icon src={ChevronDown} mini width={20} height={20} />
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
<div
|
||||
class="bg-white break-words
|
||||
p-1 {getColor(cardColor)} rounded-xl {clazz}"
|
||||
p-1 {getColor(cardColor)} rounded-md {clazz}"
|
||||
>
|
||||
<slot />
|
||||
</div>
|
||||
@@ -7,6 +7,7 @@
|
||||
viewBox="0 0 100 100"
|
||||
fill="none"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
aria-label="Home"
|
||||
>
|
||||
<path
|
||||
id="hexagon"
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import Button from '$lib/components/input/Button.svelte'
|
||||
import Link from '$lib/components/input/Link.svelte'
|
||||
import Logo from '$lib/components/ui/Logo.svelte'
|
||||
import Spinner from '$lib/components/ui/loader/Spinner.svelte'
|
||||
import Menu from '$lib/components/ui/menu/Menu.svelte'
|
||||
import MenuButton from '$lib/components/ui/menu/MenuButton.svelte'
|
||||
import { authData, getInstance, instance, user } from '$lib/lemmy.js'
|
||||
@@ -23,7 +24,7 @@
|
||||
|
||||
<nav
|
||||
class="flex flex-row gap-2 items-center sticky top-0 bg-slate-50/80
|
||||
lg:bg-white/80 lg:rounded-b-xl
|
||||
lg:bg-white/80 lg:rounded-b-md
|
||||
dark:bg-zinc-950/80 lg:dark:bg-zinc-900/80 backdrop-blur-3xl max-w-5xl
|
||||
w-full mx-auto px-4 py-2 z-50 lg:border-x lg:border-b transition-all
|
||||
border-slate-200 dark:border-zinc-800 box-border"
|
||||
@@ -31,30 +32,25 @@
|
||||
<div class="flex flex-row gap-2 items-center mr-auto">
|
||||
<a href="/" class="flex flex-row items-center gap-2">
|
||||
<Logo width={40} />
|
||||
<div class="flex flex-col">
|
||||
<span class="font-bold">Photon</span>
|
||||
<span
|
||||
class="text-xs opacity-50
|
||||
transition-opacity"
|
||||
>
|
||||
<span class="opacity-30 text-lg">/</span>
|
||||
<span class="text-sm font-bold">
|
||||
{$instance}
|
||||
</span>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
<div class="flex flex-row gap-2 py-2 px-3">
|
||||
<Link href="/communities" label="Communities">
|
||||
<Icon src={GlobeAlt} width={16} />
|
||||
<span class="hidden sm:inline ml-1">Explore</span>
|
||||
</Link>
|
||||
<Button href="/communities" label="Communities">
|
||||
<Icon src={GlobeAlt} width={16} slot="icon" />
|
||||
<span class="hidden sm:inline">Explore</span>
|
||||
</Button>
|
||||
<Menu let:toggleOpen alignment="bottom-right">
|
||||
<Button
|
||||
color={Color.accent}
|
||||
color="primary"
|
||||
slot="button"
|
||||
label="Create"
|
||||
on:click={toggleOpen}
|
||||
>
|
||||
<Icon src={Plus} width={18} mini />
|
||||
<Icon src={Plus} width={18} mini slot="icon" />
|
||||
<span class="hidden sm:inline">Create</span>
|
||||
</Button>
|
||||
<li class="text-xs opacity-80 text-left mx-4 my-1 py-1">Create</li>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<aside
|
||||
class="sticky top-20 border bg-white border-slate-200
|
||||
dark:border-zinc-800 dark:bg-zinc-900 break-words flex
|
||||
flex-col gap-4 p-6 w-[20rem] rounded-xl h-max max-h-[calc(100vh-6rem)]
|
||||
flex-col gap-4 p-6 w-[20rem] rounded-md h-max max-h-[calc(100vh-6rem)]
|
||||
overflow-auto"
|
||||
>
|
||||
<slot />
|
||||
|
||||
File renamed without changes.
@@ -1,8 +1,12 @@
|
||||
<script lang="ts">
|
||||
export let width: number = 28
|
||||
export let width: number = 32
|
||||
</script>
|
||||
|
||||
<div class="spinner" style="width: {width}px; height: {width}px;">
|
||||
<div
|
||||
class="spinner"
|
||||
style="width: {width}px; height: {width}px;"
|
||||
role="progressbar"
|
||||
>
|
||||
<div class="bar1" />
|
||||
<div class="bar2" />
|
||||
<div class="bar3" />
|
||||
@@ -25,8 +29,8 @@
|
||||
}
|
||||
|
||||
div.spinner div {
|
||||
width: 6%;
|
||||
height: 16%;
|
||||
width: 7.5%;
|
||||
height: 22%;
|
||||
position: absolute;
|
||||
left: 49%;
|
||||
top: 43%;
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
<div class="flex flex-col mx-auto gap-4 justify-center items-center">
|
||||
<h1 class="font-black text-5xl">{$page.status}</h1>
|
||||
<Link href={$page.url.toString()}>Retry</Link>
|
||||
<Button href={$page.url.toString()}>Retry</Button>
|
||||
<Button
|
||||
on:click={() => {
|
||||
corsSupported.set(false)
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
<div class="flex flex-col sm:flex-row gap-4">
|
||||
<MultiSelect
|
||||
options={['Subscribed', 'Local', 'All']}
|
||||
selected={$page.url.searchParams.get('type') ?? 'Local'}
|
||||
selected={$page.url.searchParams.get('type') ?? 'All'}
|
||||
on:select={(e) => {
|
||||
const url = $page.url
|
||||
url.searchParams.set('type', e.detail)
|
||||
@@ -36,8 +36,8 @@
|
||||
})
|
||||
}}
|
||||
/>
|
||||
<div class="flex flex-col sm:flex-row gap-2 sm:ml-auto">
|
||||
<TextInput class="rounded-md" bind:value={search} />
|
||||
<div class="flex flex-col sm:flex-row gap-2 sm:ml-auto items-center">
|
||||
<TextInput bind:value={search} />
|
||||
<Button
|
||||
on:click={() => {
|
||||
$page.url.searchParams.set('q', search)
|
||||
@@ -45,7 +45,8 @@
|
||||
invalidateAll: true,
|
||||
})
|
||||
}}
|
||||
color={Color.ghost}
|
||||
color="ghost"
|
||||
class="h-max"
|
||||
>
|
||||
Search
|
||||
</Button>
|
||||
@@ -56,20 +57,19 @@
|
||||
<li>
|
||||
<div
|
||||
class="py-4 border-b border-black/20 dark:border-white/20
|
||||
flex flex-col gap-1 text-sm"
|
||||
flex flex-col gap-1 text-sm max-w-full"
|
||||
>
|
||||
<div class="flex flex-row justify-between items-center">
|
||||
<div class="flex flex-row items-center">
|
||||
<span
|
||||
class="break-words max-w-full w-max text-base font-bold text-sky-400 hover:underline"
|
||||
>
|
||||
<CommunityLink avatar community={community.community} />
|
||||
</span>
|
||||
<div class="w-24">
|
||||
<div class="ml-auto">
|
||||
<Subscribe {community} let:subscribe let:subscribing>
|
||||
<Button
|
||||
disabled={subscribing}
|
||||
loading={subscribing}
|
||||
large
|
||||
on:click={async () => {
|
||||
const res = await subscribe()
|
||||
|
||||
@@ -81,8 +81,8 @@
|
||||
}
|
||||
}}
|
||||
color={community.subscribed == 'Subscribed'
|
||||
? Color.accent
|
||||
: Color.ghost}
|
||||
? 'primary'
|
||||
: 'ghost'}
|
||||
>
|
||||
{community.subscribed == 'Subscribed'
|
||||
? 'Subscribed'
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
import TextArea from '$lib/components/input/TextArea.svelte'
|
||||
import TextInput from '$lib/components/input/TextInput.svelte'
|
||||
import Card from '$lib/components/ui/Card.svelte'
|
||||
import Loading from '$lib/components/ui/loader/Loading.svelte'
|
||||
import Loading from '$lib/components/ui/loader/Dots.svelte'
|
||||
import { ToastType, addToast } from '$lib/components/ui/toasts/toasts.js'
|
||||
import { authData, buildBaseUrl, getClient, getInstance } from '$lib/lemmy.js'
|
||||
import { Color } from '$lib/ui/colors.js'
|
||||
@@ -152,13 +152,7 @@
|
||||
bind:files={data.image}
|
||||
/>
|
||||
</div>
|
||||
<Button
|
||||
submit
|
||||
color={Color.accent}
|
||||
large
|
||||
loading={data.loading}
|
||||
disabled={data.loading}
|
||||
>
|
||||
<Button submit color="primary" loading={data.loading} size="lg">
|
||||
Submit
|
||||
</Button>
|
||||
</form>
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
</div>
|
||||
|
||||
<div class="w-max ml-auto">
|
||||
<Link href="/post/{item.post.id}#{item.comment.id}">Jump</Link>
|
||||
<Button href="/post/{item.post.id}#{item.comment.id}">Jump</Button>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
@@ -124,7 +124,7 @@
|
||||
</p>
|
||||
{#if item.recipient.id == $user?.person.id}
|
||||
<div class="flex flex-row gap-2">
|
||||
<Button color={Color.ghost} on:click={() => (replying = !replying)}>
|
||||
<Button color="ghost" on:click={() => (replying = !replying)}>
|
||||
<Icon mini src={ChatBubbleOvalLeft} width={16} />
|
||||
Reply
|
||||
</Button>
|
||||
@@ -139,7 +139,7 @@
|
||||
{loading}
|
||||
large
|
||||
on:click={() => replyToMessage(item)}
|
||||
color={Color.accent}
|
||||
color="primary"
|
||||
>
|
||||
Submit
|
||||
</Button>
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
pattern={'(?!-)[A-Za-z0-9-]+([-.]{1}[a-z0-9]+)*.[A-Za-z]{2,6}'}
|
||||
/>
|
||||
</div>
|
||||
<div class="flex flex-row gap-2 w-full">
|
||||
<div class="flex flex-row gap-2">
|
||||
<TextInput
|
||||
id="password"
|
||||
bind:value={data.password}
|
||||
@@ -121,8 +121,8 @@
|
||||
<Button
|
||||
loading={data.loading}
|
||||
disabled={data.loading}
|
||||
large
|
||||
color={Color.accent}
|
||||
color="primary"
|
||||
size="lg"
|
||||
submit
|
||||
>
|
||||
Log in
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
import Link from '$lib/components/input/Link.svelte'
|
||||
import Comment from '$lib/components/lemmy/comment/Comment.svelte'
|
||||
import { fly } from 'svelte/transition'
|
||||
import Button from '$lib/components/input/Button.svelte'
|
||||
|
||||
export let data
|
||||
|
||||
@@ -38,7 +39,9 @@
|
||||
{item.post.name}
|
||||
</span>
|
||||
</div>
|
||||
<Link href="/post/{item.post.id}#{item.comment.id}">Jump</Link>
|
||||
<Button href="/post/{item.post.id}#{item.comment.id}">
|
||||
Jump
|
||||
</Button>
|
||||
</div>
|
||||
<div class="list-none">
|
||||
<Comment
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
/>
|
||||
<div class="w-24">
|
||||
<Button
|
||||
color={Color.accent}
|
||||
color="primary"
|
||||
large
|
||||
loading={data.loading}
|
||||
disabled={data.loading}
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
Icon,
|
||||
PencilSquare,
|
||||
} from 'svelte-hero-icons'
|
||||
import Button from '$lib/components/input/Button.svelte'
|
||||
|
||||
export let data: {
|
||||
user: GetPersonDetailsResponse
|
||||
@@ -60,7 +61,14 @@
|
||||
{item.post.name}
|
||||
</span>
|
||||
</div>
|
||||
<Link href="/post/{item.post.id}#{item.comment.id}">Jump</Link>
|
||||
<Button
|
||||
color="secondary"
|
||||
href="/post/{item.post.id}#{item.comment.id}"
|
||||
size="sm"
|
||||
class="self-start"
|
||||
>
|
||||
Jump
|
||||
</Button>
|
||||
</div>
|
||||
<div class="list-none">
|
||||
<Comment
|
||||
|
||||
@@ -1552,6 +1552,11 @@ symbol-tree@^3.2.4:
|
||||
resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
|
||||
integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
|
||||
|
||||
tailwind-merge@^1.14.0:
|
||||
version "1.14.0"
|
||||
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-1.14.0.tgz#e677f55d864edc6794562c63f5001f45093cdb8b"
|
||||
integrity sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==
|
||||
|
||||
tailwindcss@^3.3.2:
|
||||
version "3.3.3"
|
||||
resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.3.tgz#90da807393a2859189e48e9e7000e6880a736daf"
|
||||
|
||||
Reference in new issue
Block a user