Merge branch 'main' into next

This commit is contained in:
Andras Bacsai
2022-08-29 15:33:27 +02:00
5 changed files with 20 additions and 20 deletions

View File

@@ -396,5 +396,7 @@
{/if}
{/if}
<main>
<slot />
<div class="px-20">
<slot />
</div>
</main>

View File

@@ -69,6 +69,7 @@
required
bind:this={emailEl}
bind:value={email}
class="w-56 md:w-96"
/>
<input
type="password"
@@ -76,6 +77,7 @@
placeholder={$t('forms.password')}
bind:value={password}
required
class="w-56 md:w-96"
/>
<div class="flex space-x-2 h-8 items-center justify-center pt-8">
@@ -83,14 +85,13 @@
type="submit"
disabled={loading}
class="btn btn-sm"
class:loading={loading}
class:loading
class:bg-coollabs={!loading}
>{loading ? $t('login.authenticating') : $t('login.login')}</button
>
<button
on:click|preventDefault={gotoRegister}
class="btn btn-sm">{$t('register.register')}</button
<button on:click|preventDefault={gotoRegister} class="btn btn-sm"
>{$t('register.register')}</button
>
</div>
</form>

View File

@@ -101,6 +101,7 @@
required
bind:this={emailEl}
bind:value={email}
class="w-56 md:w-96"
/>
<input
type="password"
@@ -109,6 +110,7 @@
bind:this={passwordEl}
bind:value={password}
required
class="w-56 md:w-96"
/>
<input
type="password"
@@ -116,6 +118,7 @@
placeholder={$t('forms.password_again')}
bind:value={passwordCheck}
required
class="w-56 md:w-96"
/>
<div class="flex space-x-2 h-8 items-center justify-center pt-8">
@@ -125,8 +128,7 @@
disabled={loading}
class:bg-transparent={loading}
class:bg-coollabs={!loading}
class:loading={loading}
>{loading ? $t('register.registering') : $t('register.register')}</button
class:loading>{loading ? $t('register.registering') : $t('register.register')}</button
>
</div>
</form>