+ 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]}
- dispatch("click", reaction)}>
{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;
-
-
- {
@@ -45,4 +41,4 @@
{caption}
{/if}
-
+
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 = "")} />
-
- Withdraw
-
+ Withdraw
{#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}
- Back
+ Back
{/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 @@
- navigate(`/${org?.address}`)}>Done
+ navigate(`/${org?.address}`)}>
+ Done
+
{:else}
@@ -205,17 +210,15 @@
{#if state === State.Idle}
-
Create
-
+
- dispatch("close")} class="text regular">
- Close
-
+ dispatch("close")} variant="text">Close
{/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
-
+
Create
-
+
{#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 @@
- dispatch("close")}>Done
+ dispatch("close")}>
+ Done
+
{:else if state === State.Proposed && org}
@@ -104,7 +107,9 @@
- dispatch("close")}>Done
+ dispatch("close")}>
+ Done
+
{:else}
@@ -152,24 +157,24 @@
{#if state === State.Signing}
- dispatch("close")}>
+ dispatch("close")}>
Cancel
-
+
{:else if state === State.Pending}
- dispatch("close")}>
- Close
-
+ dispatch("close")}>Close
{:else if state === State.Failed}
- Back
+ Back
{:else}
-
Submit
-
+
- dispatch("close")}>Cancel
+ dispatch("close")}>
+ Cancel
+
{/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}
- {
+ {
action = Action.Execute;
state = State.Confirm;
}}
- class="small execute">
+ variant="foreground"
+ size="small">
Execute
-
+
{:else if isSigned}
✓ signed
{:else}
- {
+ {
action = Action.Sign;
state = State.Confirm;
}}
- class="small">
+ variant="foreground"
+ size="small">
Confirm
-
+
{/if}
@@ -190,20 +188,21 @@
{#if state === State.Confirm}
- confirmAnchor(anchor.safeTxHash)}>
Confirm
-
- Cancel
+
+ Cancel
{:else if state === State.Success || state === State.Failed}
- {
close();
dispatch("success");
}}>
Done
-
+
{/if}
@@ -243,20 +242,21 @@
{#if state === State.Confirm}
- executeTransaction(anchor.safeTxHash)}>
Confirm
-
- Cancel
+
+ Cancel
{:else if state === State.Success || state === State.Failed}
- {
close();
dispatch("success");
}}>
Done
-
+
{/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}
-
Check
-
+
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}
-
+
Begin registration →
-
+
{:else}
-
+
{/if}
- navigate("/registrations")} class="text">
+ navigate("/registrations")} variant="text">
Cancel
-
+
{:else if state === State.NameUnavailable || state === State.CheckingFailed}
- navigate("/registrations")} class="">Back
+ navigate("/registrations")}>
+ Back
+
{/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}
- View
+ View
{/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}
- Done
+ Done
{:else if state.status === Status.Failed}
- Close
+ Close
{/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 @@