diff --git a/index.html b/index.html index c9a5cef7..5351b73c 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ Lume - +
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index b4798f9e..a093310a 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -17,7 +17,6 @@ tauri-build = { version = "2.0.0-alpha.8", features = [] } serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } tauri = { version = "2.0.0-alpha", features = [ - "macos-private-api", "native-tls-vendored", ] } tauri-plugin-app = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 18531cad..f5c54ae7 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -82,7 +82,6 @@ "timestampUrl": "" } }, - "macOSPrivateApi": true, "security": { "dangerousRemoteDomainIpcAccess": [ { diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index fd56527b..d1e003a9 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -23,7 +23,7 @@ "theme": "Dark", "title": "Lume", "titleBarStyle": "Overlay", - "transparent": true, + "transparent": false, "center": true, "fullscreen": false, "hiddenTitle": true, diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index 19bd3611..200ba94b 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -21,12 +21,15 @@ "resizable": true, "theme": "Dark", "title": "Lume", - "transparent": false, "center": true, "fullscreen": false, "hiddenTitle": true, "visible": false, - "fileDropEnabled": true + "fileDropEnabled": true, + "transparent": true, + "windowEffects": { + "effects": ["mica"] + } } ] } diff --git a/src/app.css b/src/app.css index 6d57156e..5feb3c8a 100644 --- a/src/app.css +++ b/src/app.css @@ -49,18 +49,6 @@ input::-ms-clear { scrollbar-width: none; } -.markdown { - @apply prose prose-white max-w-none select-text text-white prose-headings:mb-1 prose-headings:mt-3 prose-p:mb-0 prose-p:mt-0 prose-p:last:mb-0 prose-a:font-normal hover:prose-a:text-fuchsia-500 prose-blockquote:mb-1 prose-blockquote:mt-1 prose-blockquote:border-l-[2px] prose-blockquote:border-fuchsia-500 prose-blockquote:pl-2 prose-pre:whitespace-pre-wrap prose-pre:break-words prose-pre:break-all prose-pre:bg-white/10 prose-ol:m-0 prose-ol:mb-1 prose-ul:mb-1 prose-ul:mt-1 prose-img:mb-2 prose-img:mt-3 prose-hr:mx-0 prose-hr:my-2; -} - -.markdown-article { - @apply prose prose-white max-w-none select-text text-white/80 prose-headings:mb-1 prose-headings:mt-3 prose-headings:text-white prose-p:mb-2 prose-p:mt-0 prose-p:break-words prose-p:[word-break:break-word] prose-a:break-words prose-a:break-all prose-a:font-normal hover:prose-a:text-fuchsia-500 prose-blockquote:mb-1 prose-blockquote:mt-1 prose-blockquote:border-l-[2px] prose-blockquote:border-fuchsia-500 prose-blockquote:pl-2 prose-pre:whitespace-pre-wrap prose-pre:break-words prose-pre:break-all prose-pre:bg-white/10 prose-ol:m-0 prose-ol:mb-1 prose-ul:mb-1 prose-ul:mt-1 prose-img:mb-2 prose-img:mt-3 prose-hr:mx-0 prose-hr:my-2; -} - -.markdown-simple { - @apply prose prose-white max-w-none select-text hyphens-auto text-white/70 prose-headings:mb-1 prose-headings:mt-3 prose-p:mb-0 prose-p:mt-0 prose-p:break-words prose-p:[word-break:break-word] prose-p:last:mb-0 prose-a:break-words prose-a:break-all prose-a:font-normal hover:prose-a:text-fuchsia-500 prose-blockquote:mb-1 prose-blockquote:mt-1 prose-blockquote:border-l-[2px] prose-blockquote:border-fuchsia-500 prose-blockquote:pl-2 prose-pre:whitespace-pre-wrap prose-pre:break-words prose-pre:break-all prose-pre:bg-white/10 prose-ol:m-0 prose-ol:mb-1 prose-ul:mb-1 prose-ul:mt-1 prose-img:mb-2 prose-img:mt-3 prose-hr:mx-0 prose-hr:my-2; -} - .ProseMirror p.is-empty::before { @apply text-white/50; content: attr(data-placeholder); diff --git a/src/app/auth/create/step-1.tsx b/src/app/auth/create/step-1.tsx index 8059a6bb..6657a17f 100644 --- a/src/app/auth/create/step-1.tsx +++ b/src/app/auth/create/step-1.tsx @@ -1,7 +1,7 @@ +import { downloadDir } from '@tauri-apps/api/path'; import { writeText } from '@tauri-apps/plugin-clipboard-manager'; import { message, save } from '@tauri-apps/plugin-dialog'; import { writeTextFile } from '@tauri-apps/plugin-fs'; -import { downloadDir } from '@tauri-apps/api/path'; import { generatePrivateKey, getPublicKey, nip19 } from 'nostr-tools'; import { useEffect, useMemo, useState } from 'react'; import { useNavigate } from 'react-router-dom'; @@ -132,7 +132,7 @@ export function CreateStep1Screen() { diff --git a/src/app/auth/create/step-2.tsx b/src/app/auth/create/step-2.tsx index 18b767f9..6cf4adbe 100644 --- a/src/app/auth/create/step-2.tsx +++ b/src/app/auth/create/step-2.tsx @@ -127,7 +127,7 @@ export function CreateStep2Screen() { @@ -105,14 +105,14 @@ export const UserWithDrawer = memo(function UserWithDrawer({ )} Message diff --git a/src/app/nwc/components/alby.tsx b/src/app/nwc/components/alby.tsx index afc44eef..d6180d71 100644 --- a/src/app/nwc/components/alby.tsx +++ b/src/app/nwc/components/alby.tsx @@ -121,7 +121,7 @@ export function NWCAlby() { diff --git a/src/app/relays/components/relayList.tsx b/src/app/relays/components/relayList.tsx index aef6d706..4e69f7af 100644 --- a/src/app/relays/components/relayList.tsx +++ b/src/app/relays/components/relayList.tsx @@ -44,17 +44,17 @@ export function RelayList() { }; return ( -
+
{status === 'loading' ? (
- +

Loading relay...

) : ( -
+

All relays used by your follows

@@ -62,14 +62,14 @@ export function RelayList() { {[...data].map(([key, value]) => (
-
+
- Relay: - + + Relay:{' '} + + {key}
@@ -94,8 +96,8 @@ export function RelayList() { ))} {value.length > 4 ? ( -
- +{value.length} +
+ +{value.length}
) : null}
diff --git a/src/app/relays/components/userRelay.tsx b/src/app/relays/components/userRelay.tsx index 45fe0608..0afb4910 100644 --- a/src/app/relays/components/userRelay.tsx +++ b/src/app/relays/components/userRelay.tsx @@ -34,7 +34,7 @@ export function UserRelay() { {data.map((item) => (
{relayUrls.includes(item) ? ( @@ -48,16 +48,16 @@ export function UserRelay() { )} -

+

{item}

))} diff --git a/src/app/relays/index.tsx b/src/app/relays/index.tsx index 41cfe7da..8d1e7c79 100644 --- a/src/app/relays/index.tsx +++ b/src/app/relays/index.tsx @@ -6,8 +6,10 @@ export function RelaysScreen() {
-
-

Connected relays

+
+

+ Connected relays +

diff --git a/src/app/relays/relay.tsx b/src/app/relays/relay.tsx index 576b2094..7705f44e 100644 --- a/src/app/relays/relay.tsx +++ b/src/app/relays/relay.tsx @@ -110,7 +110,7 @@ export function RelayScreen() { href={`https://nips.be/${item}`} target="_blank" rel="noreferrer" - className="inline-flex aspect-square h-full w-full items-center justify-center rounded-lg bg-white/10 text-sm font-medium hover:bg-fuchsia-500" + className="inline-flex aspect-square h-full w-full items-center justify-center rounded-lg bg-white/10 text-sm font-medium hover:bg-interor-500" > {item} @@ -145,7 +145,7 @@ export function RelayScreen() { href={resolvedRelay.payments_url} target="_blank" rel="noreferrer" - className="inline-flex h-10 w-full items-center justify-center rounded-lg bg-fuchsia-500 text-sm font-medium hover:bg-fuchsia-600" + className="inline-flex h-10 w-full items-center justify-center rounded-lg bg-interor-500 text-sm font-medium hover:bg-interor-600" > Open payment website diff --git a/src/app/settings/components/cacheTime.tsx b/src/app/settings/components/cacheTime.tsx index 56ac971b..2b5cc6a1 100644 --- a/src/app/settings/components/cacheTime.tsx +++ b/src/app/settings/components/cacheTime.tsx @@ -30,7 +30,7 @@ export function CacheTimeSetting() { diff --git a/src/app/space/components/toggle.tsx b/src/app/space/components/toggle.tsx index 1b4eebc3..9f5c12bf 100644 --- a/src/app/space/components/toggle.tsx +++ b/src/app/space/components/toggle.tsx @@ -12,14 +12,14 @@ export function ToggleWidgetList() {
- +
- + -
-
+
+
- + Edit profile - - + +
@@ -170,7 +170,7 @@ export function EditProfileModal() { className="h-full w-full object-cover" /> ) : ( -
+
)}
@@ -193,7 +193,7 @@ export function EditProfileModal() {
@@ -204,13 +204,13 @@ export function EditProfileModal() { minLength: 4, })} spellCheck={false} - className="relative h-11 w-full rounded-lg bg-white/10 px-3 py-1 !outline-none backdrop-blur-xl placeholder:text-white/50" + className="relative h-11 w-full rounded-lg bg-zinc-200 px-3 py-1 text-zinc-900 !outline-none backdrop-blur-xl placeholder:text-zinc-500 dark:bg-zinc-800 dark:text-zinc-100" />
@@ -221,17 +221,17 @@ export function EditProfileModal() { minLength: 4, })} spellCheck={false} - className="relative h-11 w-full rounded-lg bg-white/10 px-3 py-1 !outline-none backdrop-blur-xl placeholder:text-white/50" + className="relative h-11 w-full rounded-lg bg-zinc-200 px-3 py-1 text-zinc-900 !outline-none backdrop-blur-xl placeholder:text-zinc-500 dark:bg-zinc-800 dark:text-zinc-100" />
{nip05.verified ? ( - - + + Verified ) : ( - - + + Unverified )} @@ -246,20 +246,20 @@ export function EditProfileModal() {