diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/app.css | 21 | ||||
| -rw-r--r-- | src/components/Pinpad.svelte | 4 | ||||
| -rw-r--r-- | src/locales/en.json | 2 | ||||
| -rw-r--r-- | src/routes/(app)/send/ecash/+page.svelte | 12 | ||||
| -rw-r--r-- | src/routes/(app)/send/lightning/[payreq]/+page.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(app)/settings/[...tab]/_account.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(static)/login/+page.svelte | 48 | ||||
| -rw-r--r-- | src/routes/(static)/register/+page.svelte | 2 |
8 files changed, 51 insertions, 42 deletions
diff --git a/src/app.css b/src/app.css index 30bb63ee..a366e177 100644 --- a/src/app.css +++ b/src/app.css @@ -22,11 +22,11 @@ html { } input { - @apply input input-bordered input-lg input-primary; + @apply input } -input.blank { - all: unset; +.input { + @apply input-bordered input-lg input-primary; } textarea { @@ -37,10 +37,23 @@ select { @apply select select-bordered select-lg select-primary; } -input, textarea, select { +input, textarea, select, .input { @apply w-full rounded-2xl; } +.input:focus, .input:focus-within { + @apply outline-offset-0; +} + +input.clean { + border: none; + outline: none; + padding: 0; + margin: 0; + background: none; + box-shadow: none; +} + .btn { @apply rounded-2xl btn-lg btn-block } diff --git a/src/components/Pinpad.svelte b/src/components/Pinpad.svelte index ca308519..d61dd2a0 100644 --- a/src/components/Pinpad.svelte +++ b/src/components/Pinpad.svelte @@ -45,7 +45,7 @@ use:focus bind:value={v} type="password" - class="blank text-center !text-5xl !w-96 block" + class="clean text-center !text-5xl !w-96 block" pattern="[0-9]+" /> {:else} @@ -53,7 +53,7 @@ on:keydown={validate} use:focus bind:value={v} - class="blank text-center !text-5xl !w-96 block" + class="clean text-center !text-5xl !w-96 block" type="text" pattern="[0-9]+" /> diff --git a/src/locales/en.json b/src/locales/en.json index 07f96c96..318b97e3 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -357,7 +357,7 @@ "fastest": "Fastest", "fundingAmount": "Funding amount", "fast": "Fast", - "ecashDesc": "Ecash tokens get funded with an amount of bitcoin. They can be redeemed into a coinos account or loaded into other wallets. You can use them to give bitcoin to someone who may not have a wallet yet. Learn more at", + "ecashDesc": "Ecash tokens are funded with bitcoin. They may be redeemed in exchange for a lightning payment equal to their value or loaded back into a coinos account at any time. They can also be transferred to other ecash wallets either wholly or partially. You might use them to give bitcoin to someone who doesn't have a wallet by texting the token to them or sharing a link to it. Learn more at", "ecashToken": "Ecash token", "medium": "Medium", "maxFeeDesc": "Set an upper limit on the network routing fee. If set too low the payment may fail. You can set it higher and try again. We debit the full amount while attempting the payment but credit back any unused portion.", diff --git a/src/routes/(app)/send/ecash/+page.svelte b/src/routes/(app)/send/ecash/+page.svelte index f4978869..fa3f97da 100644 --- a/src/routes/(app)/send/ecash/+page.svelte +++ b/src/routes/(app)/send/ecash/+page.svelte @@ -30,14 +30,10 @@ </script> <div class="container px-4 max-w-xl mx-auto space-y-5 text-center"> - <div - class="p-4 border rounded-2xl space-y-2 text-lg text-left flex gap-2" - > - <div class="space-y-5"> - <div> - {$t("payments.ecashDesc")} - <a href="https://cashu.space/" class="font-bold">cashu.space</a>. - </div> + <div class="card text-left rounded-2xl shadow shadow-primary p-4 bg-base-200"> + <div class="text-secondary"> + {$t("payments.ecashDesc")} + <a href="https://cashu.space/" class="font-bold">cashu.space</a> </div> </div> <form use:enhance={handler(toggle)} method="POST" class="space-y-5"> diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.svelte b/src/routes/(app)/send/lightning/[payreq]/+page.svelte index 29dd4c05..ac5c9bec 100644 --- a/src/routes/(app)/send/lightning/[payreq]/+page.svelte +++ b/src/routes/(app)/send/lightning/[payreq]/+page.svelte @@ -114,7 +114,7 @@ id="maxfee" name="maxfee" bind:value={maxfee} - class="blank !grow" + class="clean !grow" /> <div class="ml-auto">⚡️</div> </label> diff --git a/src/routes/(app)/settings/[...tab]/_account.svelte b/src/routes/(app)/settings/[...tab]/_account.svelte index c4621f1a..8537322e 100644 --- a/src/routes/(app)/settings/[...tab]/_account.svelte +++ b/src/routes/(app)/settings/[...tab]/_account.svelte @@ -77,7 +77,7 @@ <label class="input input-bordered border-primary input-lg rounded-2xl flex items-center gap-2" > - <input type="text" name="email" class="blank" bind:value={user.email} /> + <input type="text" name="email" class="clean" bind:value={user.email} /> {#if user.verified} <iconify-icon icon="ph:check-bold" diff --git a/src/routes/(static)/login/+page.svelte b/src/routes/(static)/login/+page.svelte index 1b927406..80795160 100644 --- a/src/routes/(static)/login/+page.svelte +++ b/src/routes/(static)/login/+page.svelte @@ -95,50 +95,50 @@ /> <input type="hidden" name="token" value={token} /> - <div> - <label for="username" class="font-semibold">{$t("login.username")}</label> - <input - name="username" - type="text" - required - bind:value={username} - use:focus - autocapitalize="none" - /> - </div> + <input + name="username" + type="text" + required + bind:value={username} + use:focus + autocapitalize="none" + placeholder={$t("login.username")} + /> - <div class="relative"> - <label for="password" class="block font-semibold" - >{$t("login.password")}</label - > + <label for="password" class="input flex items-center justify-center gap-2 w-full"> {#if revealPassword} <input + class="clean w-full grow focus:!outline-offset-0" name="password" type="text" required bind:value={$password} autocapitalize="none" + placeholder={$t("login.password")} /> {:else} <input + class="clean w-full grow focus:!outline-offset-0" name="password" type="password" required bind:value={$password} autocapitalize="none" + placeholder={$t("login.password")} /> {/if} - <button - type="button" + <iconify-icon + class="cursor-pointer ml-auto" on:click={() => (revealPassword = !revealPassword)} - class="absolute right-5 top-10" - > - <Icon icon={revealPassword ? "eye" : "eye-off"} /> - </button> - </div> + icon={revealPassword ? "ph:eye-bold" : "ph:eye-slash-bold"} + width="32" + /> + </label> <div class="flex justify-end items-center"> - <a href="/forgot" class="underline underline-offset-4 text-primary-content" + <a + href="/forgot" + class="underline underline-offset-4 text-secondary" >{$t("login.forgotUserOrPassword")}</a > </div> @@ -155,7 +155,7 @@ {$t("login.noAccount")} <a href={"/register"} - class="block md:inline text-primary-content underline underline-offset-4 hover:opacity-80" + class="block md:inline text-secondary underline underline-offset-4 hover:opacity-80" > {$t("login.register")} </a> diff --git a/src/routes/(static)/register/+page.svelte b/src/routes/(static)/register/+page.svelte index db7f761c..858dd7e3 100644 --- a/src/routes/(static)/register/+page.svelte +++ b/src/routes/(static)/register/+page.svelte @@ -275,7 +275,7 @@ {$t("login.haveAccount")} <a href={"/login"} - class="block md:inline text-primary-content underline underline-offset-4 hover:opacity-80" + class="block md:inline text-secondary underline underline-offset-4 hover:opacity-80" > {$t("login.signIn")} </a> |