diff --git a/src/components/Button.svelte b/src/components/Button.svelte index aadeb5e8..9e5722e1 100644 --- a/src/components/Button.svelte +++ b/src/components/Button.svelte @@ -12,16 +12,16 @@ $: switch (color) { case 'blue': - textColor = 'white'; - borderColor = 'primary'; + textColor = 'text-white'; + borderColor = 'border-primary'; break; case 'red': - textColor = 'red-400'; - borderColor = 'red-400'; + textColor = 'text-red-400'; + borderColor = 'border-red-400'; break; case 'green': - textColor = 'green-400'; - borderColor = 'green-400'; + textColor = 'text-green-400'; + borderColor = 'border-green-400'; break; } @@ -39,6 +39,9 @@ + class={`${textColor} border-2 border-white border-opacity-25 ${ + rounded ? 'rounded-xl' : 'rounded-none' + } ${px} ${py} transition duration-100 + hover:${borderColor} focus:outline-none focus:${borderColor} disabled:opacity-50 disabled:border-gray-600 ${className}`} + on:click> diff --git a/src/locales/en.json b/src/locales/en.json index 787e8e55..e1742772 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -374,7 +374,12 @@ "median": "5★ Median", "user": "Total Users", "detail": "Detail" - } + }, + "note": [ + "Wish history is not updated automatically, please import again to update your history!", + "Paimon.moe cannot retrieve wish history older than 6 months because it's already deleted on miHoYo server, so your old wishes might not show.", + "The data are saved on your browser, so it will be deleted if you clear your browser cache! Enable Google Drive sync on setting to backup your data!" + ] }, "calculator": { "titleWeapon": "Weapon Calculator", diff --git a/src/routes/wish/_firstTime.svelte b/src/routes/wish/_firstTime.svelte index 9a05a9a5..3dfe09a1 100644 --- a/src/routes/wish/_firstTime.svelte +++ b/src/routes/wish/_firstTime.svelte @@ -1,5 +1,5 @@ -
-
+
+ Paimon + + + +

+ {$t('wish.welcome')}

- {$t('wish.welcomeStart1')} {$t('wish.autoImport')} {$t('wish.welcomeStart2')} + {$t('wish.welcomeStart1')} + {$t('wish.autoImport')} + {$t('wish.welcomeStart2')} +

- {$t('wish.manual')} + {$t('wish.manual')} +

-
-
- -
-
+ + diff --git a/src/routes/wish/index.svelte b/src/routes/wish/index.svelte index f983ac3f..6f405702 100644 --- a/src/routes/wish/index.svelte +++ b/src/routes/wish/index.svelte @@ -124,7 +124,6 @@ counter3.readLocalData(); counter4.readLocalData(); } - @@ -191,4 +190,14 @@
+
+ Paimon +
+
    +
  1. {$t('wish.note.0')}
  2. +
  3. {$t('wish.note.1')}
  4. +
  5. {$t('wish.note.2')}
  6. +
+
+
diff --git a/static/images/paimon_hello.png b/static/images/paimon_hello.png new file mode 100644 index 00000000..d1c6add8 Binary files /dev/null and b/static/images/paimon_hello.png differ