From 8acf82e7bb8d78aff79b5dab16f03fec12666478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Aaron?= Date: Tue, 31 Oct 2023 18:23:24 +0100 Subject: [PATCH] fix: styles, darkmode, descriptions --- models.go | 18 +-- public/css/application.css | 139 ++---------------- .../images/{Lightning.svg => lightning.svg} | 0 public/images/{Wallet.svg => wallet.svg} | 0 views/apps/new.html | 30 ++-- 5 files changed, 33 insertions(+), 154 deletions(-) rename public/images/{Lightning.svg => lightning.svg} (100%) rename public/images/{Wallet.svg => wallet.svg} (100%) diff --git a/models.go b/models.go index 37e7aef1..f38d82ae 100644 --- a/models.go +++ b/models.go @@ -35,16 +35,16 @@ const ( ) var nip47MethodDescriptions = map[string]string{ - NIP_47_GET_BALANCE_METHOD: "Read access to your wallet", - NIP_47_PAY_INVOICE_METHOD: "Send payments", - NIP_47_MAKE_INVOICE_METHOD: "Create invoices", + NIP_47_GET_BALANCE_METHOD: "Read your balance", + NIP_47_PAY_INVOICE_METHOD: "Send payments", + NIP_47_MAKE_INVOICE_METHOD: "Create invoices", NIP_47_LOOKUP_INVOICE_METHOD: "Lookup statuses of invoices", } var nip47MethodIcons = map[string]string{ - NIP_47_GET_BALANCE_METHOD: "wallet", - NIP_47_PAY_INVOICE_METHOD: "lightning", - NIP_47_MAKE_INVOICE_METHOD: "invoice", + NIP_47_GET_BALANCE_METHOD: "wallet", + NIP_47_PAY_INVOICE_METHOD: "lightning", + NIP_47_MAKE_INVOICE_METHOD: "invoice", NIP_47_LOOKUP_INVOICE_METHOD: "search", } @@ -204,6 +204,6 @@ type Nip47LookupInvoiceParams struct { } type Nip47LookupInvoiceResponse struct { - Invoice string `json:"invoice"` - Paid bool `json:"paid"` -} \ No newline at end of file + Invoice string `json:"invoice"` + Paid bool `json:"paid"` +} diff --git a/public/css/application.css b/public/css/application.css index cd49a544..890fe4cf 100644 --- a/public/css/application.css +++ b/public/css/application.css @@ -717,10 +717,6 @@ select { pointer-events: none; } -.fixed { - position: fixed; -} - .absolute { position: absolute; } @@ -729,13 +725,6 @@ select { position: relative; } -.inset-0 { - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; -} - .left-0 { left: 0px; } @@ -749,21 +738,11 @@ select { margin-right: 0.5rem; } -.mx-4 { - margin-left: 1rem; - margin-right: 1rem; -} - .mx-auto { margin-left: auto; margin-right: auto; } -.my-2 { - margin-top: 0.5rem; - margin-bottom: 0.5rem; -} - .my-4 { margin-top: 1rem; margin-bottom: 1rem; @@ -886,10 +865,6 @@ select { height: 1.5rem; } -.max-h-\[90vh\] { - max-height: 90vh; -} - .w-1\/5 { width: 20%; } @@ -926,10 +901,6 @@ select { width: 24px; } -.w-\[500px\] { - width: 500px; -} - .w-\[65px\] { width: 65px; } @@ -964,10 +935,6 @@ select { list-style-type: disc; } -.grid-cols-3 { - grid-template-columns: repeat(3, minmax(0, 1fr)); -} - .grid-cols-4 { grid-template-columns: repeat(4, minmax(0, 1fr)); } @@ -1004,19 +971,6 @@ select { gap: 0.5rem; } -.gap-4 { - gap: 1rem; -} - -.gap-x-8 { - -moz-column-gap: 2rem; - column-gap: 2rem; -} - -.gap-y-4 { - row-gap: 1rem; -} - .divide-y > :not([hidden]) ~ :not([hidden]) { --tw-divide-y-reverse: 0; border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse))); @@ -1032,10 +986,6 @@ select { overflow: hidden; } -.overflow-y-scroll { - overflow-y: scroll; -} - .rounded { border-radius: 0.25rem; } @@ -1092,14 +1042,14 @@ select { border-color: rgb(34 197 94 / var(--tw-border-opacity)); } -.border-red-400 { +.border-purple-700 { --tw-border-opacity: 1; - border-color: rgb(248 113 113 / var(--tw-border-opacity)); + border-color: rgb(126 34 206 / var(--tw-border-opacity)); } -.border-purple-700 { +.border-red-400 { --tw-border-opacity: 1; - border-color: rgb(126 34 206 / var(--tw-border-opacity)); + border-color: rgb(248 113 113 / var(--tw-border-opacity)); } .border-l-gray-200 { @@ -1107,26 +1057,11 @@ select { border-left-color: rgb(229 231 235 / var(--tw-border-opacity)); } -.bg-blue-50 { - --tw-bg-opacity: 1; - background-color: rgb(239 246 255 / var(--tw-bg-opacity)); -} - -.bg-gray-100 { - --tw-bg-opacity: 1; - background-color: rgb(243 244 246 / var(--tw-bg-opacity)); -} - .bg-gray-50 { --tw-bg-opacity: 1; background-color: rgb(249 250 251 / var(--tw-bg-opacity)); } -.bg-gray-900 { - --tw-bg-opacity: 1; - background-color: rgb(17 24 39 / var(--tw-bg-opacity)); -} - .bg-green-100 { --tw-bg-opacity: 1; background-color: rgb(220 252 231 / var(--tw-bg-opacity)); @@ -1137,6 +1072,11 @@ select { background-color: rgb(255 247 237 / var(--tw-bg-opacity)); } +.bg-purple-100 { + --tw-bg-opacity: 1; + background-color: rgb(243 232 255 / var(--tw-bg-opacity)); +} + .bg-purple-700 { --tw-bg-opacity: 1; background-color: rgb(126 34 206 / var(--tw-bg-opacity)); @@ -1147,21 +1087,6 @@ select { background-color: rgb(255 255 255 / var(--tw-bg-opacity)); } -.bg-purple-500 { - --tw-bg-opacity: 1; - background-color: rgb(168 85 247 / var(--tw-bg-opacity)); -} - -.bg-purple-200 { - --tw-bg-opacity: 1; - background-color: rgb(233 213 255 / var(--tw-bg-opacity)); -} - -.bg-purple-100 { - --tw-bg-opacity: 1; - background-color: rgb(243 232 255 / var(--tw-bg-opacity)); -} - .fill-current { fill: currentColor; } @@ -1347,11 +1272,6 @@ select { color: rgb(0 0 0 / var(--tw-text-opacity)); } -.text-blue-700 { - --tw-text-opacity: 1; - color: rgb(29 78 216 / var(--tw-text-opacity)); -} - .text-gray-400 { --tw-text-opacity: 1; color: rgb(156 163 175 / var(--tw-text-opacity)); @@ -1397,11 +1317,6 @@ select { color: rgb(194 65 12 / var(--tw-text-opacity)); } -.text-purple-600 { - --tw-text-opacity: 1; - color: rgb(147 51 234 / var(--tw-text-opacity)); -} - .text-purple-700 { --tw-text-opacity: 1; color: rgb(126 34 206 / var(--tw-text-opacity)); @@ -1494,11 +1409,6 @@ select { box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000); } -.focus\:ring-purple-500:focus { - --tw-ring-opacity: 1; - --tw-ring-color: rgb(168 85 247 / var(--tw-ring-opacity)); -} - .focus\:ring-purple-700:focus { --tw-ring-opacity: 1; --tw-ring-color: rgb(126 34 206 / var(--tw-ring-opacity)); @@ -1519,11 +1429,6 @@ select { border-color: rgb(255 255 255 / 0.1); } - .dark\:border-gray-500 { - --tw-border-opacity: 1; - border-color: rgb(107 114 128 / var(--tw-border-opacity)); - } - .dark\:border-gray-700 { --tw-border-opacity: 1; border-color: rgb(55 65 81 / var(--tw-border-opacity)); @@ -1538,11 +1443,6 @@ select { border-color: rgb(255 255 255 / 0.1); } - .dark\:bg-gray-600 { - --tw-bg-opacity: 1; - background-color: rgb(75 85 99 / var(--tw-bg-opacity)); - } - .dark\:bg-green-900 { --tw-bg-opacity: 1; background-color: rgb(20 83 45 / var(--tw-bg-opacity)); @@ -1633,18 +1533,10 @@ select { color: rgb(156 163 175 / var(--tw-placeholder-opacity)); } - .dark\:ring-offset-gray-700 { - --tw-ring-offset-color: #374151; - } - .dark\:ring-offset-gray-800 { --tw-ring-offset-color: #1f2937; } - .dark\:\[color-scheme\:dark\] { - color-scheme: dark; - } - .dark\:hover\:bg-surface-16dp:hover { --tw-bg-opacity: 1; background-color: rgb(56 56 56 / var(--tw-bg-opacity)); @@ -1659,10 +1551,6 @@ select { --tw-ring-opacity: 1; --tw-ring-color: rgb(147 51 234 / var(--tw-ring-opacity)); } - - .dark\:focus\:ring-offset-gray-700:focus { - --tw-ring-offset-color: #374151; - } } @media (min-width: 640px) { @@ -1718,20 +1606,11 @@ select { flex: 1 1 0%; } - .md\:grid-cols-5 { - grid-template-columns: repeat(5, minmax(0, 1fr)); - } - .md\:px-0 { padding-left: 0px; padding-right: 0px; } - .md\:px-6 { - padding-left: 1.5rem; - padding-right: 1.5rem; - } - .md\:px-8 { padding-left: 2rem; padding-right: 2rem; diff --git a/public/images/Lightning.svg b/public/images/lightning.svg similarity index 100% rename from public/images/Lightning.svg rename to public/images/lightning.svg diff --git a/public/images/Wallet.svg b/public/images/wallet.svg similarity index 100% rename from public/images/Wallet.svg rename to public/images/wallet.svg diff --git a/views/apps/new.html b/views/apps/new.html index 6f9434bc..709d6cbd 100644 --- a/views/apps/new.html +++ b/views/apps/new.html @@ -5,7 +5,7 @@

{{if .Name}} Connect to {{.Name}} {{else}} - Create a new app connection + Connect a new app {{end}}

@@ -39,8 +39,8 @@

-
-

Authorise the new app to:

+
+

Authorise the new app to:

@@ -49,33 +49,33 @@

  • - - + +
    • {{ end }}

    -

    Budget allowance per month

    -
    -
    100
    -
    1000
    -
    10,000
    -
    100,000
    -
    Unlimited
    +

    Monthly budget

    +
    +
    10k
    sats
    +
    50k
    sats
    +
    100k
    sats
    +
    1M
    sats
    +
    Unlimited
    #reckless
    + Add connection expiry time
    -