diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3575d58dde2033..16ebc22fc7a2aa 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,7 +22,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/src/fonts/inter/Inter-Regular.woff2 b/components/dashboard/src/fonts/inter/Inter-Regular.woff2 new file mode 100644 index 00000000000000..6c2b6893d59320 Binary files /dev/null and b/components/dashboard/src/fonts/inter/Inter-Regular.woff2 differ diff --git a/components/dashboard/src/fonts/inter/Inter-SemiBold.woff2 b/components/dashboard/src/fonts/inter/Inter-SemiBold.woff2 new file mode 100644 index 00000000000000..611e90c958f1b7 Binary files /dev/null and b/components/dashboard/src/fonts/inter/Inter-SemiBold.woff2 differ diff --git a/components/dashboard/src/index.css b/components/dashboard/src/index.css index e2fe644c9d4905..12cfd3070a0f18 100644 --- a/components/dashboard/src/index.css +++ b/components/dashboard/src/index.css @@ -8,6 +8,17 @@ @tailwind components; @tailwind utilities; +@font-face { + font-family: Inter; + font-weight: 400; + src: url('fonts/inter/Inter-Regular.woff2') format('woff2'); +} +@font-face { + font-family: Inter; + font-weight: 600; + src: url('fonts/inter/Inter-SemiBold.woff2') format('woff2'); +} + @layer base { html, body { diff --git a/components/dashboard/tailwind.config.js b/components/dashboard/tailwind.config.js index ec804e8b546e98..92c46be74bef2c 100644 --- a/components/dashboard/tailwind.config.js +++ b/components/dashboard/tailwind.config.js @@ -6,6 +6,7 @@ // tailwind.config.js const colors = require("tailwindcss/colors"); +const defaultTheme = require("tailwindcss/defaultTheme"); module.exports = { jit: true, @@ -28,13 +29,9 @@ module.exports = { sky: colors.sky, rose: colors.rose, "gitpod-black": "#161616", - "gitpod-gray": "#8E8787", "gitpod-red": "#CE4A3E", "gitpod-kumquat-light": "#FFE4BC", "gitpod-kumquat": "#FFB45B", - "gitpod-kumquat-dark": "#FF8A00", - "gitpod-kumquat-darker": "#f28300", - "gitpod-kumquat-gradient": "linear-gradient(137.41deg, #FFAD33 14.37%, #FF8A00 91.32%)", }, container: { center: true, @@ -55,22 +52,7 @@ module.exports = { }, }, fontFamily: { - sans: [ - "Inter", - "system-ui", - "-apple-system", - "BlinkMacSystemFont", - "Segoe UI", - "Roboto", - "Helvetica Neue", - "Arial", - "Noto Sans", - "sans-serif", - "Apple Color Emoji", - "Segoe UI Emoji", - "Segoe UI Symbol", - "Noto Color Emoji", - ], + sans: ["Inter", ...defaultTheme.fontFamily.sans], mono: [ "JetBrains Mono", "SF Mono",