diff --git a/apps/app-frontend/src/providers/setup/auth.ts b/apps/app-frontend/src/providers/setup/auth.ts index 2de8c0acf..8832c09c6 100644 --- a/apps/app-frontend/src/providers/setup/auth.ts +++ b/apps/app-frontend/src/providers/setup/auth.ts @@ -1,5 +1,5 @@ import type { Labrinth } from '@modrinth/api-client' -import { type AuthProvider, provideAuth } from '@modrinth/ui' +import { type AuthProvider, type AuthUser, provideAuth } from '@modrinth/ui' import { computed, type Ref, ref, watchEffect } from 'vue' type AppCredentials = { @@ -12,7 +12,7 @@ export function setupAuthProvider( requestSignIn: (redirectPath: string) => void | Promise, ) { const sessionToken = ref(null) - const user = ref(null) + const user = ref(null) const isReady = computed(() => credentials.value !== undefined) const authProvider: AuthProvider = { diff --git a/apps/app-frontend/vite.config.ts b/apps/app-frontend/vite.config.ts index 5db05f562..d97b76d8f 100644 --- a/apps/app-frontend/vite.config.ts +++ b/apps/app-frontend/vite.config.ts @@ -58,6 +58,9 @@ export default defineConfig({ params: { overrides: { removeViewBox: false, + cleanupIds: { + minify: false, + }, }, }, }, diff --git a/apps/frontend/nuxt.config.ts b/apps/frontend/nuxt.config.ts index 6a05ce659..83f428f01 100644 --- a/apps/frontend/nuxt.config.ts +++ b/apps/frontend/nuxt.config.ts @@ -104,6 +104,9 @@ export default defineNuxtConfig({ params: { overrides: { removeViewBox: false, + cleanupIds: { + minify: false, + }, }, }, }, diff --git a/apps/frontend/src/assets/styles/components.scss b/apps/frontend/src/assets/styles/components.scss index cb9f0e2f8..6b91a25ff 100644 --- a/apps/frontend/src/assets/styles/components.scss +++ b/apps/frontend/src/assets/styles/components.scss @@ -1,18 +1,18 @@ /* Cards and body styling */ +// CARDS .base-card { - padding: var(--spacing-card-lg); + padding: 1rem; position: relative; + min-height: var(--font-size-2xl); - background-color: var(--color-raised-bg); - border-radius: var(--size-rounded-card); + background-color: var(--surface-3); + border-radius: var(--radius-lg); + border: 1px solid var(--surface-4); - margin-bottom: var(--spacing-card-md); + margin-bottom: var(--gap-md); outline: 2px solid transparent; - outline-offset: -2px; - - box-shadow: var(--shadow-card); .card__overlay { position: absolute; @@ -25,6 +25,17 @@ z-index: 2; } + &:where(&.warning, &.information) { + padding: 1.5rem; + line-height: 1.5; + min-height: 0; + + a { + color: var(--color-blue); + text-decoration: underline; + } + } + &.moderation-card { background-color: var(--color-warning-banner-bg); } diff --git a/apps/frontend/src/components/ui/AdPlaceholder.vue b/apps/frontend/src/components/ui/AdPlaceholder.vue index 01f25ead1..7c7737520 100644 --- a/apps/frontend/src/components/ui/AdPlaceholder.vue +++ b/apps/frontend/src/components/ui/AdPlaceholder.vue @@ -3,7 +3,7 @@
diff --git a/apps/frontend/src/components/ui/NavStack.vue b/apps/frontend/src/components/ui/NavStack.vue index 4e2735d19..16bef5bbb 100644 --- a/apps/frontend/src/components/ui/NavStack.vue +++ b/apps/frontend/src/components/ui/NavStack.vue @@ -1,7 +1,8 @@