From b687d37b03a026d4965779368717890954bb4f56 Mon Sep 17 00:00:00 2001 From: Brandon Oxendine Date: Thu, 30 Jun 2022 23:09:33 +0200 Subject: [PATCH] Unify button heights Signed-off-by: Brandon Oxendine --- public/index.css | 22 ++++++++++++++++++---- src/Form.svelte | 4 ++-- src/Header.svelte | 16 +++++++++++----- src/Profile.svelte | 6 +++--- src/RadicleUrn.svelte | 2 +- src/Search.svelte | 1 + src/SiweConnect.svelte | 2 +- src/base/orgs/Create.svelte | 4 ++-- src/base/orgs/Index.svelte | 2 +- src/base/orgs/TransferOwnership.svelte | 10 +++++----- src/base/profiles/AnchorActions.svelte | 4 ++-- src/base/projects/Browser.svelte | 2 +- src/base/registrations/Index.svelte | 2 +- src/base/registrations/View.svelte | 4 ++-- src/base/vesting/Index.svelte | 8 ++++---- src/components/Modal/ConnectWallet.svelte | 4 ++-- src/ens/DomainInput.svelte | 10 ++++++---- src/ens/SetName.svelte | 8 ++++---- 18 files changed, 67 insertions(+), 44 deletions(-) diff --git a/public/index.css b/public/index.css index 159bc0c7f..fd9235e95 100644 --- a/public/index.css +++ b/public/index.css @@ -74,12 +74,20 @@ --font-family-monospace: monospace; --font-weight-medium: 600; --font-weight-bold: 700; + --border-radius: 50px; --border-radius-medium: 0.25rem; + --box-shadow-color: var(--color-secondary-2); + --content-max-width: 1920px; --content-min-width: 480px; + --scrollbar-width: 0.5rem; + + --button-regular-height: 2.5rem; + --button-small-height: 2rem; + --button-tiny-height: 1.5rem; } body { @@ -165,15 +173,18 @@ button { color: var(--color-foreground-6); background: transparent; font-size: 1rem; - padding: 1rem 1.5rem; + padding: 0rem 1.5rem; border: 1px solid var(--color-foreground-6); border-radius: var(--border-radius); cursor: pointer; min-width: 8rem; + display: inline-flex; + align-items: center; } button:not([disabled]):hover { color: var(--color-background); background-color: var(--color-foreground); + border-color: transparent; } button.waiting { cursor: wait; @@ -233,12 +244,13 @@ button.text:hover { background-color: var(--color-foreground); } -button.small { +button.regular { padding-top: 0.5rem; padding-bottom: 0.5rem; min-width: 6rem; + height: var(--button-regular-height); } -button.tiny { +button.small { min-width: auto; padding: 0 0.75rem; height: 2rem; @@ -280,8 +292,9 @@ input[type="text"] { background: transparent; border: 1px solid var(--color-secondary); border-radius: var(--border-radius); - padding: 1rem 1.5rem; + padding: 0rem 1.5rem; margin: 1rem; + height: var(--button-regular-height); } input[type="text"]::placeholder { color: var(--color-secondary); @@ -358,6 +371,7 @@ label.input { margin: 0 0.5rem; font-size: 0.75rem; line-height: 1.6; + height: var(--button-tiny-height); } .badge.primary { color: var(--color-primary); diff --git a/src/Form.svelte b/src/Form.svelte index af07b8ed2..44b81c9f2 100644 --- a/src/Form.svelte +++ b/src/Form.svelte @@ -235,10 +235,10 @@
- -
diff --git a/src/Header.svelte b/src/Header.svelte index b900dc18b..4ace71dd7 100644 --- a/src/Header.svelte +++ b/src/Header.svelte @@ -41,10 +41,12 @@ align-items: center; margin: 0; padding: 1.5rem; + height: 5.5rem; } header .left, header .right { display: flex; align-items: center; + height: var(--button-regular-height); } header .nav { display: inline-block; @@ -70,6 +72,8 @@ .logo { display: flex; + height: var(--button-regular-height); + align-items: center; } .error { text-align: center; @@ -86,7 +90,7 @@ text-decoration: none; } .search { - height: 42px; + height: var(--button-regular-height); width: 16rem; margin-left: 1.5rem; display: inline-block; @@ -96,7 +100,6 @@ flex-direction: row; align-items: center; justify-content: center; - min-height: 42px; margin-left: 2rem; width: 10rem; padding-left: 0; @@ -110,8 +113,11 @@ color: var(--color-tertiary); background-color: var(--color-tertiary-background); line-height: 1.5em; - padding: 0.5rem 1rem; + padding: 0rem 1rem; border-radius: var(--border-radius); + height: var(--button-regular-height); + display: flex; + align-items: center; } .network.unavailable { color: #888; @@ -196,7 +202,7 @@ {/if} - {:else if config} - + {/if}
diff --git a/src/Profile.svelte b/src/Profile.svelte index 92ab1938f..df350af41 100644 --- a/src/Profile.svelte +++ b/src/Profile.svelte @@ -244,7 +244,7 @@
{#await account && profile.org.isMember(account, config) then isMember} {#if isOwner(profile.org) || isMember} - {/if} @@ -287,7 +287,7 @@ {:then authorized} {#if authorized} - {/if} @@ -315,7 +315,7 @@
{#if isUserAuthorized(profile.address)} - {/if} diff --git a/src/RadicleUrn.svelte b/src/RadicleUrn.svelte index d3370d18b..5828214f5 100644 --- a/src/RadicleUrn.svelte +++ b/src/RadicleUrn.svelte @@ -41,7 +41,7 @@
- - {/if} diff --git a/src/base/orgs/Index.svelte b/src/base/orgs/Index.svelte index 4f2489e8a..cb5fc0d0c 100644 --- a/src/base/orgs/Index.svelte +++ b/src/base/orgs/Index.svelte @@ -66,7 +66,7 @@
My Orgs -
diff --git a/src/base/orgs/TransferOwnership.svelte b/src/base/orgs/TransferOwnership.svelte index 957b1c2a5..64c17644e 100644 --- a/src/base/orgs/TransferOwnership.svelte +++ b/src/base/orgs/TransferOwnership.svelte @@ -84,7 +84,7 @@
-
@@ -102,7 +102,7 @@
-
@@ -144,15 +144,15 @@
{#if state == State.Signing} - {:else if state == State.Pending} - {:else if state == State.Failed} - {:else} diff --git a/src/base/profiles/AnchorActions.svelte b/src/base/profiles/AnchorActions.svelte index 9163f8c97..9bf3a3a29 100644 --- a/src/base/profiles/AnchorActions.svelte +++ b/src/base/profiles/AnchorActions.svelte @@ -124,7 +124,7 @@ @@ -134,7 +134,7 @@ {/if} diff --git a/src/base/projects/Browser.svelte b/src/base/projects/Browser.svelte index 630feb9d7..38e961b7e 100644 --- a/src/base/projects/Browser.svelte +++ b/src/base/projects/Browser.svelte @@ -160,7 +160,7 @@ {#if tree.entries.length > 0} diff --git a/src/base/registrations/Index.svelte b/src/base/registrations/Index.svelte index 4a7877b5c..758ecca2b 100644 --- a/src/base/registrations/Index.svelte +++ b/src/base/registrations/Index.svelte @@ -53,7 +53,7 @@ /> -
diff --git a/src/base/registrations/View.svelte b/src/base/registrations/View.svelte index ff377269a..64d7152bc 100644 --- a/src/base/registrations/View.svelte +++ b/src/base/registrations/View.svelte @@ -183,11 +183,11 @@

{domain}

- diff --git a/src/base/vesting/Index.svelte b/src/base/vesting/Index.svelte index b6481942e..a61323be0 100644 --- a/src/base/vesting/Index.svelte +++ b/src/base/vesting/Index.svelte @@ -79,20 +79,20 @@ {#if isBeneficiary} {#if $state === State.WithdrawingSign} - {:else if $state === State.Withdrawing} - {:else if $state === State.Idle} - {/if} {/if} - diff --git a/src/components/Modal/ConnectWallet.svelte b/src/components/Modal/ConnectWallet.svelte index 0fdfa1e44..0f342111c 100644 --- a/src/components/Modal/ConnectWallet.svelte +++ b/src/components/Modal/ConnectWallet.svelte @@ -68,10 +68,10 @@
- -
diff --git a/src/ens/DomainInput.svelte b/src/ens/DomainInput.svelte index 6b03869cc..b99a51f27 100644 --- a/src/ens/DomainInput.svelte +++ b/src/ens/DomainInput.svelte @@ -18,14 +18,16 @@