-
+
-
{$t('welcome_to_immich')}
-
diff --git a/web/src/routes/auth/change-password/+page.svelte b/web/src/routes/auth/change-password/+page.svelte
index ea340ff600728..b37bbf754e04e 100644
--- a/web/src/routes/auth/change-password/+page.svelte
+++ b/web/src/routes/auth/change-password/+page.svelte
@@ -1,11 +1,10 @@
- {#snippet message()}
-
- {$t('hi_user', { values: { name: $user.name, email: $user.email } })}
-
-
- {$t('change_password_description')}
-
- {/snippet}
-
-
diff --git a/web/src/routes/auth/login/+page.svelte b/web/src/routes/auth/login/+page.svelte
index 63346a6abf69f..2d4310a032070 100644
--- a/web/src/routes/auth/login/+page.svelte
+++ b/web/src/routes/auth/login/+page.svelte
@@ -1,17 +1,14 @@
{#if $featureFlags.loaded}
-
- {#snippet message()}
-
+
+ {#if $serverConfig.loginPageMessage}
+
{@html $serverConfig.loginPageMessage}
-
- {/snippet}
+
+ {/if}
{#if !oauthLoading && $featureFlags.passwordLogin}
-
{/if}
@@ -164,29 +139,23 @@
{/if}
{#if oauthError}
-
{oauthError}
+
{/if}
- {#if oauthLoading}
-
-
-
- {:else}
- {$serverConfig.oauthButtonText}
- {/if}
+ {$serverConfig.oauthButtonText}
{/if}
{#if !$featureFlags.passwordLogin && !$featureFlags.oauth}
- {$t('login_has_been_disabled')}
+
{/if}
{/if}
diff --git a/web/src/routes/auth/register/+page.svelte b/web/src/routes/auth/register/+page.svelte
index 43e28d5964687..5c74144b764f3 100644
--- a/web/src/routes/auth/register/+page.svelte
+++ b/web/src/routes/auth/register/+page.svelte
@@ -1,12 +1,11 @@
- {#snippet message()}
-
- {$t('admin.registration_description')}
-
- {/snippet}
+
+ {$t('admin.registration_description')}
+
-
diff --git a/web/tailwind.config.js b/web/tailwind.config.js
index eb1ea78fae76f..12bfd7c604da4 100644
--- a/web/tailwind.config.js
+++ b/web/tailwind.config.js
@@ -2,7 +2,7 @@ import plugin from 'tailwindcss/plugin';
/** @type {import('tailwindcss').Config} */
export default {
- content: ['./src/**/*.{html,js,svelte,ts}'],
+ content: ['./src/**/*.{html,js,svelte,ts}', './node_modules/@immich/ui/dist/**/*.{svelte,js}'],
darkMode: 'class',
theme: {
extend: {
@@ -24,7 +24,20 @@ export default {
'immich-dark-error': 'rgb(var(--immich-dark-error) / )',
'immich-dark-success': 'rgb(var(--immich-dark-success) / )',
'immich-dark-warning': 'rgb(var(--immich-dark-warning) / )',
+
+ primary: 'rgb(var(--immich-ui-primary) / )',
+ light: 'rgb(var(--immich-ui-light) / )',
+ dark: 'rgb(var(--immich-ui-dark) / )',
+ success: 'rgb(var(--immich-ui-success) / )',
+ danger: 'rgb(var(--immich-ui-danger) / )',
+ warning: 'rgb(var(--immich-ui-warning) / )',
+ info: 'rgb(var(--immich-ui-info) / )',
+ subtle: 'rgb(var(--immich-gray) / )',
},
+ borderColor: ({ theme }) => ({
+ ...theme('colors'),
+ DEFAULT: 'rgb(var(--immich-ui-default-border) / )',
+ }),
fontFamily: {
'immich-mono': ['Overpass Mono', 'monospace'],
},
diff --git a/web/vite.config.js b/web/vite.config.js
index 266312e137dbb..5d134beab081b 100644
--- a/web/vite.config.js
+++ b/web/vite.config.js
@@ -19,6 +19,7 @@ export default defineConfig({
'xmlhttprequest-ssl': './node_modules/engine.io-client/lib/xmlhttprequest.js',
// eslint-disable-next-line unicorn/prefer-module
'@test-data': path.resolve(__dirname, './src/test-data'),
+ // '@immich/ui': path.resolve(__dirname, '../../ui'),
},
},
server: {