Skip to content

Commit

Permalink
Merge pull request #996 from vrc-get/monospace-font
Browse files Browse the repository at this point in the history
fix(gui): do not use monospace with user input text
  • Loading branch information
anatawa12 committed May 19, 2024
2 parents 60a5e1a + 041d75b commit 1c1114d
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 16 deletions.
4 changes: 4 additions & 0 deletions vrc-get-gui/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,7 @@ h5 {
h6 {
@apply text-sm;
}

code {
@apply font-mono;
}
2 changes: 1 addition & 1 deletion vrc-get-gui/app/projects/manage/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ function PageBody() {
{tc("projects:manage:project location",
{path: projectPath},
{
components: {code: <code className={"bg-gray-200 p-0.5 whitespace-pre"}/>}
components: {path: <span className={"p-0.5 font-path whitespace-pre bg-gray-100"}/>}
})}
</Typography>
<div className={"flex-grow-0 flex-shrink-0 w-2"}></div>
Expand Down
2 changes: 1 addition & 1 deletion vrc-get-gui/app/projects/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -912,7 +912,7 @@ function CreateProject(
<Typography variant={"small"} className={"whitespace-normal"}>
{tc("projects:hint:path of creating project", {path: `${projectLocation}${pathSeparator()}${projectName}`}, {
components: {
code: <code className={"whitespace-pre"}/>
path: <span className={"p-0.5 font-path whitespace-pre bg-gray-100"}/>
}
})}
</Typography>
Expand Down
4 changes: 2 additions & 2 deletions vrc-get-gui/locales/de.json5
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"projects:template:type": "Typ:",
"projects:latest": "Neueste",
"projects:template:unity version": "Unity Version:",
"projects:hint:path of creating project": "Das Projekt wird sich hier befinden: <code>{{path}}</code>",
"projects:hint:path of creating project": "Das Projekt wird sich hier befinden: <path>{{path}}</path>",
"projects:creating project...": "Erstelle Projekt...",
"projects:button:create": "Erstellen",
"projects:toast:project created": "Projekt erfolgreich erstellt",
Expand All @@ -89,7 +89,7 @@
"projects:toast:unity migrate failed by unity not found": "Fehler beim migrieren: Unity 2022 nicht gefunden",
"projects:toast:unity migration finalize failed by unity not found": "Fehler beim abschluss der Migration: Unity 2022 nicht gefunden",
"projects:toast:unity migrated": "Das Projekt wurde zu Unity 2022 migriert",
"projects:manage:project location": "Pfad: <code>{{path}}</code>",
"projects:manage:project location": "Pfad: <path>{{path}}</path>",
"projects:manage:unity version": "Unity Version: ",
"projects:manage:manage packages": "Pakete verwalten",
"projects:manage:tooltip:refresh packages": "Pakete aktualisieren",
Expand Down
4 changes: 2 additions & 2 deletions vrc-get-gui/locales/en.json5
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"projects:template:type": "Type:",
"projects:latest": "Latest",
"projects:template:unity version": "Unity Version:",
"projects:hint:path of creating project": "The new project will be at <code>{{path}}</code>.",
"projects:hint:path of creating project": "The new project will be at <path>{{path}}</path>.",
"projects:creating project...": "Creating the project...",
"projects:button:create": "Create",
"projects:toast:project created": "Project was created successfully.",
Expand All @@ -89,7 +89,7 @@
"projects:toast:unity migrate failed by unity not found": "Failed to migrate project: Unity 2022 not found",
"projects:toast:unity migration finalize failed by unity not found": "Failed to finalize the migration: Unity 2022 not found",
"projects:toast:unity migrated": "The project was migrated to Unity 2022",
"projects:manage:project location": "Located at: <code>{{path}}</code>",
"projects:manage:project location": "Located at: <path>{{path}}</path>",
"projects:manage:unity version": "Unity version: ",
"projects:manage:manage packages": "Manage Packages",
"projects:manage:tooltip:refresh packages": "Refresh Packages",
Expand Down
4 changes: 2 additions & 2 deletions vrc-get-gui/locales/fr.json5
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"projects:hint:warn multibyte char in project name": "L'utilisation de certains caracthères multibytes peu causer des problèmes.",
"projects:hint:project already exists": "Le dossier existe déja.",
"projects:template": "Modèle:",
"projects:hint:path of creating project": "Le nouveau projet sera dans le dossier <code>{{path}}</code>",
"projects:hint:path of creating project": "Le nouveau projet sera dans le dossier <path>{{path}}</path>",
"projects:creating project...": "Création du projet...",
"projects:button:create": "Créer",
"projects:toast:project created": "Projet créer avec succès.",
Expand All @@ -86,7 +86,7 @@
"projects:toast:unity migrate failed by unity not found": "Echec de migration du projet: Unity 2022 non trouvé",
"projects:toast:unity migration finalize failed by unity not found": "Echec de l'initialization de la migration: Unity 2022 non trouvé",
"projects:toast:unity migrated": "Le projet a été migré en Unity 2022",
"projects:manage:project location": "Emplacement: <code>{{path}}</code>",
"projects:manage:project location": "Emplacement: <path>{{path}}</path>",
"projects:manage:unity version": "Version de Unity: ",
"projects:manage:manage packages": "Gestion des packages",
"projects:manage:tooltip:refresh packages": "Rafraichir les packages",
Expand Down
10 changes: 5 additions & 5 deletions vrc-get-gui/locales/ja.json5
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"projects:type:sdk2": "SDK2",
"projects:type:worlds": "ワールド",
"projects:type:avatars": "アバター",
"projects:type:custom": "カスタムテンプレート",
"projects:type:custom": "カスタムテンプレート",
"general:loading...": "読込中...",
"projects:error:load error": "プロジェクトリストの読込中にエラーが発生しました: {{msg}}",
"projects:toast:unity exits with non-zero": "Unityが0以外の終了コードで終了しました。",
Expand Down Expand Up @@ -62,10 +62,10 @@
"projects:hint:warn multibyte char in project name": "マルチバイト文字を使用すると問題が発生する可能性があります。",
"projects:hint:project already exists": "そのディレクトリは既に存在しています。",
"projects:template": "テンプレート:",
"projects:template:type": "種類:",
"projects:latest": "最新",
"projects:template:type": "種類:",
"projects:latest": "最新",
"projects:template:unity version": "Unityバージョン:",
"projects:hint:path of creating project": "新しいプロジェクトは <code>{{path}}</code> に保存されます。",
"projects:hint:path of creating project": "新しいプロジェクトは <path>{{path}}</path> に保存されます。",
"projects:creating project...": "プロジェクトを作成中...",
"projects:button:create": "作成する",
"projects:toast:project created": "プロジェクトを作成しました。",
Expand All @@ -83,7 +83,7 @@
"projects:toast:unity migrate failed by unity not found": "プロジェクト移行に失敗しました: Unity 2022がありません",
"projects:toast:unity migration finalize failed by unity not found": "プロジェクト移行の完了処理を行えませんでした: Unity 2022がありません",
"projects:toast:unity migrated": "プロジェクトをUnity 2022に移行しました。",
"projects:manage:project location": "保存場所: <code>{{path}}</code>",
"projects:manage:project location": "保存場所: <path>{{path}}</path>",
"projects:manage:unity version": "Unityバージョン: ",
"projects:manage:manage packages": "パッケージ管理",
"projects:manage:tooltip:refresh packages": "パッケージリストを再読み込み",
Expand Down
4 changes: 2 additions & 2 deletions vrc-get-gui/locales/zh_hans.json5
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"projects:template:type": "类型",
"projects:latest": "最新",
"projects:template:unity version": "Unity 版本:",
"projects:hint:path of creating project": "新项目将位于 <code>{{path}}</code>",
"projects:hint:path of creating project": "新项目将位于 <path>{{path}}</path>",
"projects:creating project...": "创建项目中...",
"projects:button:create": "创建",
"projects:toast:project created": "项目创建成功",
Expand All @@ -89,7 +89,7 @@
"projects:toast:unity migrate failed by unity not found": "迁移项目失败: 未找到 Unity 2022",
"projects:toast:unity migration finalize failed by unity not found": "未能完成迁移: 未找到 Unity 2022",
"projects:toast:unity migrated": "项目已迁移至 Unity 2022",
"projects:manage:project location": "位于: <code>{{path}}</code>",
"projects:manage:project location": "位于: <path>{{path}}</path>",
"projects:manage:unity version": "Unity 版本: ",
"projects:manage:manage packages": "管理软件包",
"projects:manage:tooltip:refresh packages": "刷新软件包",
Expand Down
3 changes: 2 additions & 1 deletion vrc-get-gui/tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ const config: Config = {
},
fontFamily: {
sans: ["system-ui"],
mono: ["monospace"],
path: ["system-ui"],
mono: ["consolas", "monospace"],
}
},
},
Expand Down

0 comments on commit 1c1114d

Please sign in to comment.