diff --git a/locales/de.arb b/locales/de-DE.arb similarity index 99% rename from locales/de.arb rename to locales/de-DE.arb index 218bc49..efec0a5 100644 --- a/locales/de.arb +++ b/locales/de-DE.arb @@ -1,5 +1,5 @@ { - "@@locale": "de", + "@@locale": "de-DE", "helpwaveId": "helpwave id", "@helpwaveId": { "description": "Titel für helpwave id Badge" diff --git a/locales/en.arb b/locales/en-US.arb similarity index 99% rename from locales/en.arb rename to locales/en-US.arb index a0cc7be..71e9c7e 100644 --- a/locales/en.arb +++ b/locales/en-US.arb @@ -1,5 +1,5 @@ { - "@@locale": "en", + "@@locale": "en-US", "helpwaveId": "helpwave id", "@helpwaveId": { "description": "Title for helpwave id badge" diff --git a/package.json b/package.json index 27269d9..b95441b 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "id.helpwave.de", - "version": "0.1.2", + "version": "0.1.3", "repository": { "type": "git", "url": "git://github.com/helpwave/id.helpwave.de.git" diff --git a/src/i18n/translations.ts b/src/i18n/translations.ts index fb986d8..151b0f4 100644 --- a/src/i18n/translations.ts +++ b/src/i18n/translations.ts @@ -5,7 +5,7 @@ import type { Translation } from '@helpwave/internationalization' import { TranslationGen } from '@helpwave/internationalization' -export const helpwaveIdTranslationLocales = ['de', 'en'] as const +export const helpwaveIdTranslationLocales = ['de-DE', 'en-US'] as const export type HelpwaveIdTranslationLocales = typeof helpwaveIdTranslationLocales[number] @@ -78,7 +78,7 @@ export type HelpwaveIdTranslationEntries = { } export const helpwaveIdTranslation: Translation> = { - 'de': { + 'de-DE': { 'acceptTerms': `Ich akzeptiere die Allgemeinen Geschäftsbedingungen`, 'backToApplication': `Zurück zur Anwendung`, 'backToLogin': `Zurück zur Anmeldung`, @@ -150,7 +150,7 @@ export const helpwaveIdTranslation: Translation useHightideTranslation(helpwaveIdTranslation) diff --git a/src/index.css b/src/index.css index 777d55a..b4ea260 100644 --- a/src/index.css +++ b/src/index.css @@ -1,21 +1,9 @@ @import "tailwindcss"; - -:root { - --hw-color-secondary-50: #f9fafb; - --hw-color-secondary-100: #f3f4f6; - --hw-color-secondary-200: #e5e7eb; - --hw-color-secondary-300: #d1d5db; - --hw-color-secondary-400: #9ca3af; - --hw-color-secondary-500: #6b7280; - --hw-color-secondary-600: #4b5563; - --hw-color-secondary-700: #374151; - --hw-color-secondary-800: #1f2937; - --hw-color-secondary-900: #111827; -} +@import "@helpwave/hightide/style/uncompiled/globals.css"; +@source "./node_modules/@helpwave/hightide"; @layer base { - body { - min-height: 100vh; - background-color: var(--hw-color-background) !important; + html, body, main { + @apply bg-background text-on-background; } } diff --git a/src/login/components/Branding.tsx b/src/login/components/Branding.tsx index 6b0e11e..7e9a63c 100644 --- a/src/login/components/Branding.tsx +++ b/src/login/components/Branding.tsx @@ -4,9 +4,9 @@ export function Branding() { return (
-
+
helpwave id
) -} \ No newline at end of file +} diff --git a/src/login/components/Footer.tsx b/src/login/components/Footer.tsx index 3a849af..c832796 100644 --- a/src/login/components/Footer.tsx +++ b/src/login/components/Footer.tsx @@ -1,25 +1,18 @@ -import type { KcContext } from '../KcContext' import { useTranslation } from '../../i18n/useTranslation' -type FooterProps = { - kcContext: KcContext, -} - -export function Footer({ kcContext }: FooterProps) { - const locale = kcContext.locale?.currentLanguageTag ?? 'en' - const t = useTranslation(locale) +export function Footer() { + const t = useTranslation() return (
) -} \ No newline at end of file +} diff --git a/src/login/components/LanguageSwitcher.tsx b/src/login/components/LanguageSwitcher.tsx index 521b523..f9bd909 100644 --- a/src/login/components/LanguageSwitcher.tsx +++ b/src/login/components/LanguageSwitcher.tsx @@ -20,7 +20,7 @@ export function LanguageSwitcher({ kcContext }: LanguageSwitcherProps) { <>
) -} \ No newline at end of file +} diff --git a/src/login/components/ThemeSwitcher.tsx b/src/login/components/ThemeSwitcher.tsx index a3e3557..7f990e1 100644 --- a/src/login/components/ThemeSwitcher.tsx +++ b/src/login/components/ThemeSwitcher.tsx @@ -9,7 +9,7 @@ export function ThemeSwitcher() { <>