diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ec6923be2312e7..03028d05452714 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: exclude: | (?x)^( .*example-layer.tar.gz| - .*\.(png|svg|ico|gpg)| + .*\.(png|svg|ico|gpg|woff2)| dev/version-manifest/version-manifest| .*gradle-wrapper\.jar )$ diff --git a/components/dashboard/public/fonts/JetBrainsMono-Regular.woff2 b/components/dashboard/public/fonts/JetBrainsMono-Regular.woff2 new file mode 100644 index 00000000000000..40da427651937a Binary files /dev/null and b/components/dashboard/public/fonts/JetBrainsMono-Regular.woff2 differ diff --git a/components/dashboard/public/index.html b/components/dashboard/public/index.html index 0bf52894cce683..625aa4127dcd2d 100644 --- a/components/dashboard/public/index.html +++ b/components/dashboard/public/index.html @@ -18,6 +18,7 @@ /> + Dashboard — Gitpod diff --git a/components/dashboard/src/projects/Prebuilds.tsx b/components/dashboard/src/projects/Prebuilds.tsx index 3804aa9a1577f3..129b9dd9bc4e83 100644 --- a/components/dashboard/src/projects/Prebuilds.tsx +++ b/components/dashboard/src/projects/Prebuilds.tsx @@ -281,7 +281,7 @@ export default function (props: { project?: Project; isAdminDashboard?: boolean /> )} Authored {formatDate(p.info.changeDate)} ·{" "} - {p.info.changeHash?.substring(0, 8)} + {p.info.changeHash?.substring(0, 8)}

@@ -290,7 +290,7 @@ export default function (props: { project?: Project; isAdminDashboard?: boolean
{p.info.branch} diff --git a/components/dashboard/src/projects/Project.tsx b/components/dashboard/src/projects/Project.tsx index 7f8ba4ee305a26..4282f4d8d9b02d 100644 --- a/components/dashboard/src/projects/Project.tsx +++ b/components/dashboard/src/projects/Project.tsx @@ -338,10 +338,10 @@ export default function () {
-
+
{branch.name} {branch.isDefault && ( - + DEFAULT )} @@ -356,7 +356,9 @@ export default function () {

{avatar}Authored {formatDate(branch.changeDate)} ·{" "} - {branch.changeHash?.substring(0, 8)} + + {branch.changeHash?.substring(0, 8)} +

diff --git a/components/dashboard/src/projects/ProjectListItem.tsx b/components/dashboard/src/projects/ProjectListItem.tsx index 7639a67edbf434..8e8128aba65697 100644 --- a/components/dashboard/src/projects/ProjectListItem.tsx +++ b/components/dashboard/src/projects/ProjectListItem.tsx @@ -87,7 +87,7 @@ export const ProjectListItem: FunctionComponent = ({ proje > {prebuildStatusIcon(prebuild)}
{prebuild?.info?.branch} diff --git a/components/dashboard/src/projects/ProjectVariables.tsx b/components/dashboard/src/projects/ProjectVariables.tsx index 91eb6e70ccd091..4ce408b6210200 100644 --- a/components/dashboard/src/projects/ProjectVariables.tsx +++ b/components/dashboard/src/projects/ProjectVariables.tsx @@ -77,7 +77,7 @@ export default function () { {envVars.map((variable) => { return ( - {variable.name} + {variable.name} {variable.censored ? "Hidden" : "Visible"} void }) {

Name

void }) {

Value

Name { @@ -72,7 +72,7 @@ function AddEnvVarModal(p: EnvVarModalProps) {

Value

{ @@ -83,7 +83,7 @@ function AddEnvVarModal(p: EnvVarModalProps) {

Scope

Scope
- {p.variable.name} - {p.variable.repositoryPattern} + {p.variable.name} + {p.variable.repositoryPattern}
); @@ -262,10 +262,10 @@ export default function EnvVars() { {envVars.map((variable) => { return ( - + {variable.name} - + {variable.repositoryPattern} -
{currentBranch}
+
+ {currentBranch} +
diff --git a/components/dashboard/src/workspaces/WorkspaceEntryNew.tsx b/components/dashboard/src/workspaces/WorkspaceEntryNew.tsx index 23ecd2396d1c5a..0a1466912870c8 100644 --- a/components/dashboard/src/workspaces/WorkspaceEntryNew.tsx +++ b/components/dashboard/src/workspaces/WorkspaceEntryNew.tsx @@ -68,7 +68,9 @@ export const WorkspaceEntry: FunctionComponent = ({ info }) => {
-
{currentBranch}
+
+ {currentBranch} +
diff --git a/components/dashboard/tailwind.config.js b/components/dashboard/tailwind.config.js index 8d3ab6f29dc9d2..e9bb1cb42997b4 100644 --- a/components/dashboard/tailwind.config.js +++ b/components/dashboard/tailwind.config.js @@ -64,7 +64,7 @@ module.exports = { "Segoe UI Symbol", "Noto Color Emoji", ], - mono: ["SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", "monospace"], + mono: ["JetBrains Mono", "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", "monospace"], }, underlineThickness: { thin: "2px",