From dc8a8f883c2798d4b651a984258ac10860aaebb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= Date: Fri, 2 Sep 2022 16:04:37 +0200 Subject: [PATCH] Extract Button component MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rūdolfs Ošiņš --- public/index.css | 98 +-------------- src/Button.svelte | 134 +++++++++++++++++++++ src/Connect.svelte | 15 ++- src/Error.svelte | 8 +- src/Form.svelte | 16 ++- src/Header.svelte | 22 ++-- src/NotFound.svelte | 3 +- src/Profile.svelte | 16 ++- src/RadicleUrn.svelte | 22 ++-- src/Reactions.svelte | 17 ++- src/SiweConnect.svelte | 14 +-- src/ToggleButton.svelte | 1 + src/base/faucet/Index.svelte | 5 +- src/base/faucet/Withdraw.svelte | 3 +- src/base/orgs/Create.svelte | 19 +-- src/base/orgs/Index.svelte | 13 +- src/base/orgs/TransferOwnership.svelte | 29 +++-- src/base/profiles/AnchorActions.svelte | 50 ++++---- src/base/projects/Browser.svelte | 12 +- src/base/projects/Patch/PatchTabBar.svelte | 1 + src/base/registrations/Index.svelte | 8 +- src/base/registrations/New.svelte | 18 ++- src/base/registrations/Submit.svelte | 3 +- src/base/registrations/Update.svelte | 5 +- src/base/registrations/View.svelte | 24 ++-- src/base/resolver/List.svelte | 3 +- src/base/vesting/Index.svelte | 25 ++-- src/components/Modal/ConnectWallet.svelte | 13 +- src/ens/SetName.svelte | 37 ++++-- 29 files changed, 352 insertions(+), 282 deletions(-) create mode 100644 src/Button.svelte diff --git a/public/index.css b/public/index.css index a62fe0a73..abef65cd7 100644 --- a/public/index.css +++ b/public/index.css @@ -167,104 +167,11 @@ section { body, input, -textarea, -button { +textarea { font-family: var(--font-family-sans-serif); font-feature-settings: "ss01", "ss02", "cv01", "cv03"; } -button { - color: var(--color-foreground-6); - background: transparent; - font-size: 1rem; - padding: 0rem 1.5rem; - border: 1px solid var(--color-foreground-6); - border-radius: var(--border-radius-round); - cursor: pointer; - min-width: 6rem; - height: var(--button-regular-height); - display: inline-flex; - align-items: center; - justify-content: center; -} -button:not([disabled]):hover { - color: var(--color-background); - background-color: var(--color-foreground); - border-color: transparent; -} -button.waiting { - cursor: wait; -} -button.secondary { - color: var(--color-secondary); - border-color: var(--color-secondary); -} -button.secondary[disabled] { - color: var(--color-secondary-faded); - border-color: var(--color-secondary-faded); -} -button.secondary:not([disabled]):hover { - background-color: var(--color-secondary); -} -button.primary { - color: var(--color-primary); - border-color: var(--color-primary); -} -button.primary:hover, -button.primary.active { - color: var(--color-background); - background-color: var(--color-primary); -} -button.primary[disabled] { - color: var(--color-primary-faded) !important; - border-color: var(--color-primary-faded) !important; - background-color: transparent; -} -button.faded { - color: var(--color-foreground-90); - border-color: var(--color-foreground-90); -} -button[disabled] { - cursor: not-allowed !important; - color: var(--color-foreground-faded); - border-color: var(--color-foreground-faded); -} -button[data-waiting] { - cursor: wait !important; -} -button.unstyled, -button.unstyled:hover, -button.unstyled:focus { - padding: 0; - margin: 0; - min-width: 0; - border: none; - color: var(--color-foreground); - background: transparent; -} - -button.text { - color: var(--color-foreground-6); - background-color: transparent; - border: none; - min-width: 3rem; -} -button.text:hover { - background-color: var(--color-foreground); -} - -button.regular { - padding-top: 0.5rem; - padding-bottom: 0.5rem; - min-width: 6rem; - height: var(--button-regular-height); -} -button.small { - min-width: auto; - padding: 0 0.75rem; - height: 2rem; -} - a { color: inherit; text-decoration: none; @@ -290,8 +197,7 @@ a.address { border-bottom-color: transparent; } -input[type="text"], -button { +input[type="text"] { line-height: 1.6; } input[type="text"] { diff --git a/src/Button.svelte b/src/Button.svelte new file mode 100644 index 000000000..97367f83f --- /dev/null +++ b/src/Button.svelte @@ -0,0 +1,134 @@ + + + + + diff --git a/src/Connect.svelte b/src/Connect.svelte index ca6a3f114..f5e9fc412 100644 --- a/src/Connect.svelte +++ b/src/Connect.svelte @@ -5,11 +5,11 @@ import Error from "@app/Error.svelte"; import type { Config } from "@app/config"; import ConnectWallet from "@app/components/Modal/ConnectWallet.svelte"; + import Button from "@app/Button.svelte"; export let caption = "Connect"; - export let className = ""; - export let style = ""; export let config: Config; + export let buttonVariant: "foreground" | "primary"; let error: Err | null = null; @@ -34,18 +34,17 @@ $: walletConnectState = config.walletConnect.state; - + {#if $walletConnectState.state === "open"} + import type { Err } from "@app/error"; + import { createEventDispatcher } from "svelte"; import Modal from "@app/Modal.svelte"; - import type { Err } from "@app/error"; + import Button from "@app/Button.svelte"; const dispatch = createEventDispatcher(); @@ -38,9 +40,9 @@ - + diff --git a/src/Form.svelte b/src/Form.svelte index 2f280cc3e..04bf39942 100644 --- a/src/Form.svelte +++ b/src/Form.svelte @@ -1,4 +1,5 @@ @@ -19,13 +18,13 @@
{#each Object.entries(reactions) as [reaction, count]} - + {/each}
{/if} diff --git a/src/SiweConnect.svelte b/src/SiweConnect.svelte index d004b7e9b..c2c453a75 100644 --- a/src/SiweConnect.svelte +++ b/src/SiweConnect.svelte @@ -5,6 +5,7 @@ import { signInWithEthereum } from "@app/siwe"; import Loading from "@app/Loading.svelte"; import { Connection } from "@app/session"; + import Button from "@app/Button.svelte"; export let seed: Seed; export let config: Config; @@ -16,14 +17,9 @@ let connection: Connection = Connection.Disconnected; - - - + diff --git a/src/ToggleButton.svelte b/src/ToggleButton.svelte index 242098d10..010848d57 100644 --- a/src/ToggleButton.svelte +++ b/src/ToggleButton.svelte @@ -40,6 +40,7 @@ padding: 0.25rem 0.5rem; border: none; min-width: 0; + background-color: var(--color-background); } button:hover, button.active { diff --git a/src/base/faucet/Index.svelte b/src/base/faucet/Index.svelte index 07640658d..aa9b2ada2 100644 --- a/src/base/faucet/Index.svelte +++ b/src/base/faucet/Index.svelte @@ -10,6 +10,7 @@ lastWithdrawalByUser, calculateTimeLock, } from "./lib"; + import Button from "@app/Button.svelte"; export let config: Config; @@ -142,9 +143,7 @@ placeholder="Set amount to withdraw" bind:value={amount} on:input={() => (error = "")} /> - + {#if error}
diff --git a/src/base/faucet/Withdraw.svelte b/src/base/faucet/Withdraw.svelte index ec46a48ed..ec842b078 100644 --- a/src/base/faucet/Withdraw.svelte +++ b/src/base/faucet/Withdraw.svelte @@ -8,6 +8,7 @@ import { Status, State } from "@app/utils"; import { withdraw } from "./lib"; import { session } from "@app/session"; + import Button from "@app/Button.svelte"; export let config: Config; @@ -80,7 +81,7 @@ {#if state.status === Status.Success} - + {/if} diff --git a/src/base/orgs/Create.svelte b/src/base/orgs/Create.svelte index 47092f3fa..4959fba4d 100644 --- a/src/base/orgs/Create.svelte +++ b/src/base/orgs/Create.svelte @@ -9,6 +9,7 @@ import Loading from "@app/Loading.svelte"; import Options from "@app/Options.svelte"; import Address from "@app/Address.svelte"; + import Button from "@app/Button.svelte"; export let config: Config; export let owner: string; @@ -149,7 +150,11 @@ - + {:else} @@ -205,17 +210,15 @@ {#if state === State.Idle} - + - + {/if} diff --git a/src/base/orgs/Index.svelte b/src/base/orgs/Index.svelte index 69aa999b9..bb04962f4 100644 --- a/src/base/orgs/Index.svelte +++ b/src/base/orgs/Index.svelte @@ -8,6 +8,7 @@ import Message from "@app/Message.svelte"; import Cards from "@app/Cards.svelte"; import { setOpenGraphMetaTag } from "@app/utils"; + import Button from "@app/Button.svelte"; export let config: Config; @@ -37,6 +38,7 @@ display: flex; align-items: center; padding: 1rem 0; + gap: 1.5rem; } .my-orgs { @@ -48,10 +50,6 @@ color: var(--color-foreground-faded); } - button.create { - margin-left: 1.5rem; - } - .loading { padding: 2rem 0; } @@ -68,12 +66,9 @@ My Orgs - + {#await Org.getOrgsByMember(account, config)} diff --git a/src/base/orgs/TransferOwnership.svelte b/src/base/orgs/TransferOwnership.svelte index 93022d4af..6cc5a3125 100644 --- a/src/base/orgs/TransferOwnership.svelte +++ b/src/base/orgs/TransferOwnership.svelte @@ -7,6 +7,7 @@ import { assert } from "@app/error"; import * as utils from "@app/utils"; import Address from "@app/Address.svelte"; + import Button from "@app/Button.svelte"; import type { Org } from "./Org"; @@ -84,7 +85,9 @@
- +
{:else if state === State.Proposed && org} @@ -104,7 +107,9 @@
- +
{:else} @@ -152,24 +157,24 @@
{#if state === State.Signing} - + {:else if state === State.Pending} - + {:else if state === State.Failed} - + {:else} - + - + {/if}
diff --git a/src/base/profiles/AnchorActions.svelte b/src/base/profiles/AnchorActions.svelte index add1b2158..7dad20943 100644 --- a/src/base/profiles/AnchorActions.svelte +++ b/src/base/profiles/AnchorActions.svelte @@ -8,6 +8,7 @@ import Avatar from "@app/Avatar.svelte"; import { createEventDispatcher } from "svelte"; import Badge from "@app/Badge.svelte"; + import Button from "@app/Button.svelte"; export let safe: Safe; export let anchor: PendingAnchor; @@ -109,11 +110,6 @@ display: flex; margin-right: 0.75rem; } - button.execute { - display: flex; - align-items: center; - justify-content: center; - } @@ -131,26 +127,28 @@ {#if pending <= 0} - + {:else if isSigned} ✓ signed {:else} - + {/if} @@ -190,20 +188,21 @@ {#if state === State.Confirm} - - + + {:else if state === State.Success || state === State.Failed} - + {/if} @@ -243,20 +242,21 @@ {#if state === State.Confirm} - - + + {:else if state === State.Success || state === State.Failed} - + {/if} diff --git a/src/base/projects/Browser.svelte b/src/base/projects/Browser.svelte index dd3f2b49a..359130b9f 100644 --- a/src/base/projects/Browser.svelte +++ b/src/base/projects/Browser.svelte @@ -4,6 +4,7 @@ import Loading from "@app/Loading.svelte"; import Placeholder from "@app/Placeholder.svelte"; import * as utils from "@app/utils"; + import Button from "@app/Button.svelte"; import Tree from "./Tree.svelte"; import Blob from "./Blob.svelte"; @@ -128,10 +129,6 @@ } @media (max-width: 720px) { - button.browse { - width: 100%; - border-color: var(--color-secondary-faded); - } .column-right { padding: 1.5rem 0; min-width: 0; @@ -161,11 +158,12 @@ {#if tree.entries.length > 0} {/if} diff --git a/src/base/projects/Patch/PatchTabBar.svelte b/src/base/projects/Patch/PatchTabBar.svelte index 9b75a7db7..284dfc9f0 100644 --- a/src/base/projects/Patch/PatchTabBar.svelte +++ b/src/base/projects/Patch/PatchTabBar.svelte @@ -60,6 +60,7 @@ font-size: 0.75rem; height: var(--button-tiny-height); padding: 0.25rem 0.5rem; + background-color: var(--color-background); } .revision-toggle:hover { background-color: var(--color-foreground-background); diff --git a/src/base/registrations/Index.svelte b/src/base/registrations/Index.svelte index 00c529622..37bd52ea8 100644 --- a/src/base/registrations/Index.svelte +++ b/src/base/registrations/Index.svelte @@ -3,6 +3,7 @@ import type { Config } from "@app/config"; import DomainInput from "@app/ens/DomainInput.svelte"; + import Button from "@app/Button.svelte"; export let config: Config; @@ -94,12 +95,13 @@ {/if} - + diff --git a/src/base/registrations/New.svelte b/src/base/registrations/New.svelte index 9fd6999ff..21df67a09 100644 --- a/src/base/registrations/New.svelte +++ b/src/base/registrations/New.svelte @@ -9,6 +9,7 @@ import Modal from "@app/Modal.svelte"; import Loading from "@app/Loading.svelte"; import Message from "@app/Message.svelte"; + import Button from "@app/Button.svelte"; import { registrar } from "./registrar"; @@ -97,18 +98,23 @@ {#if state === State.NameAvailable} {#if $session} - + {:else} - + {/if} - + {:else if state === State.NameUnavailable || state === State.CheckingFailed} - + {/if} diff --git a/src/base/registrations/Submit.svelte b/src/base/registrations/Submit.svelte index 059659627..9d7743315 100644 --- a/src/base/registrations/Submit.svelte +++ b/src/base/registrations/Submit.svelte @@ -9,6 +9,7 @@ import Modal from "@app/Modal.svelte"; import Err from "@app/Error.svelte"; import BlockTimer from "@app/BlockTimer.svelte"; + import Button from "@app/Button.svelte"; import { registerName, State, state } from "./registrar"; @@ -100,7 +101,7 @@ {#if $state.connection === State.Registered} - + {/if} diff --git a/src/base/registrations/Update.svelte b/src/base/registrations/Update.svelte index 9d69b0e95..16dbcedd5 100644 --- a/src/base/registrations/Update.svelte +++ b/src/base/registrations/Update.svelte @@ -7,6 +7,7 @@ import Loading from "@app/Loading.svelte"; import Modal from "@app/Modal.svelte"; import { Status, State } from "@app/utils"; + import Button from "@app/Button.svelte"; export let domain: string; export let config: Config; @@ -71,9 +72,9 @@ {#if [Status.Signing, Status.Pending].includes(state.status)} {:else if state.status === Status.Success} - + {:else if state.status === Status.Failed} - + {/if} diff --git a/src/base/registrations/View.svelte b/src/base/registrations/View.svelte index 9f626b326..b35553f15 100644 --- a/src/base/registrations/View.svelte +++ b/src/base/registrations/View.svelte @@ -12,6 +12,7 @@ import { assert } from "@app/error"; import Error from "@app/Error.svelte"; import { isAddressEqual, isReverseRecordSet } from "@app/utils"; + import Button from "@app/Button.svelte"; import { getRegistration, getOwner } from "./registrar"; import type { EnsRecord } from "./resolver"; @@ -261,15 +262,20 @@

{domain}

- +
+ {#if !editable} + + {/if} +
- + diff --git a/src/base/vesting/Index.svelte b/src/base/vesting/Index.svelte index 9c3cd3435..dc9e1aaf2 100644 --- a/src/base/vesting/Index.svelte +++ b/src/base/vesting/Index.svelte @@ -8,6 +8,7 @@ import Modal from "@app/Modal.svelte"; import Address from "@app/Address.svelte"; import { formatAddress, isAddressEqual } from "@app/utils"; + import Button from "@app/Button.svelte"; let input: HTMLElement; @@ -107,22 +108,22 @@ {#if isBeneficiary} {#if $state === State.WithdrawingSign} - + {:else if $state === State.Withdrawing} - + {:else if $state === State.Idle} - + {/if} {/if} - + {:else} @@ -143,13 +144,13 @@ bind:value={contractAddress} /> - + {/if} diff --git a/src/components/Modal/ConnectWallet.svelte b/src/components/Modal/ConnectWallet.svelte index c55ffe881..f5187ccdd 100644 --- a/src/components/Modal/ConnectWallet.svelte +++ b/src/components/Modal/ConnectWallet.svelte @@ -1,10 +1,12 @@