From: Jeremy Davis Date: Tue, 4 Apr 2023 08:20:52 +0000 (+0200) Subject: SONAR-18940 Embed Inter font X-Git-Tag: 10.1.0.73491~461 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=db412aaf26ffc6bfa83ec216cab97ddbb408e8d7;p=sonarqube.git SONAR-18940 Embed Inter font --- diff --git a/server/sonar-web/config/esbuild-config.js b/server/sonar-web/config/esbuild-config.js index b0a861f8fa2..3c1ec5150c1 100644 --- a/server/sonar-web/config/esbuild-config.js +++ b/server/sonar-web/config/esbuild-config.js @@ -56,7 +56,7 @@ module.exports = (release) => { return { entryPoints: ['src/main/js/app/index.ts'], tsconfig: './tsconfig.json', - external: ['/images/*'], + external: ['/images/*', '/fonts/*'], loader: { '.png': 'dataurl', '.md': 'text', diff --git a/server/sonar-web/public/fonts/Inter/Inter-Black.woff2 b/server/sonar-web/public/fonts/Inter/Inter-Black.woff2 new file mode 100644 index 00000000000..68f64c9ed98 Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-Black.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-BlackItalic.woff2 b/server/sonar-web/public/fonts/Inter/Inter-BlackItalic.woff2 new file mode 100644 index 00000000000..1c9c7ca8b04 Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-BlackItalic.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-Bold.woff2 b/server/sonar-web/public/fonts/Inter/Inter-Bold.woff2 new file mode 100644 index 00000000000..2846f29cc8a Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-Bold.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-BoldItalic.woff2 b/server/sonar-web/public/fonts/Inter/Inter-BoldItalic.woff2 new file mode 100644 index 00000000000..0b1fe8e1255 Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-BoldItalic.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-ExtraBold.woff2 b/server/sonar-web/public/fonts/Inter/Inter-ExtraBold.woff2 new file mode 100644 index 00000000000..c24c2bdc2f0 Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-ExtraBold.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-ExtraBoldItalic.woff2 b/server/sonar-web/public/fonts/Inter/Inter-ExtraBoldItalic.woff2 new file mode 100644 index 00000000000..4a81dc79826 Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-ExtraBoldItalic.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-ExtraLight.woff2 b/server/sonar-web/public/fonts/Inter/Inter-ExtraLight.woff2 new file mode 100644 index 00000000000..f2ea706fafa Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-ExtraLight.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-ExtraLightItalic.woff2 b/server/sonar-web/public/fonts/Inter/Inter-ExtraLightItalic.woff2 new file mode 100644 index 00000000000..9af717ba91b Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-ExtraLightItalic.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-Italic.woff2 b/server/sonar-web/public/fonts/Inter/Inter-Italic.woff2 new file mode 100644 index 00000000000..a619fc54861 Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-Italic.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-Light.woff2 b/server/sonar-web/public/fonts/Inter/Inter-Light.woff2 new file mode 100644 index 00000000000..bc4be6658b0 Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-Light.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-LightItalic.woff2 b/server/sonar-web/public/fonts/Inter/Inter-LightItalic.woff2 new file mode 100644 index 00000000000..842b2dfcb77 Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-LightItalic.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-Medium.woff2 b/server/sonar-web/public/fonts/Inter/Inter-Medium.woff2 new file mode 100644 index 00000000000..f92498a2ecf Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-Medium.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-MediumItalic.woff2 b/server/sonar-web/public/fonts/Inter/Inter-MediumItalic.woff2 new file mode 100644 index 00000000000..0e3019f4ae7 Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-MediumItalic.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-Regular.woff2 b/server/sonar-web/public/fonts/Inter/Inter-Regular.woff2 new file mode 100644 index 00000000000..6c2b6893d59 Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-Regular.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-SemiBold.woff2 b/server/sonar-web/public/fonts/Inter/Inter-SemiBold.woff2 new file mode 100644 index 00000000000..611e90c958f Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-SemiBold.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-SemiBoldItalic.woff2 b/server/sonar-web/public/fonts/Inter/Inter-SemiBoldItalic.woff2 new file mode 100644 index 00000000000..545685bd2c6 Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-SemiBoldItalic.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-Thin.woff2 b/server/sonar-web/public/fonts/Inter/Inter-Thin.woff2 new file mode 100644 index 00000000000..abbc3a5c962 Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-Thin.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/Inter-ThinItalic.woff2 b/server/sonar-web/public/fonts/Inter/Inter-ThinItalic.woff2 new file mode 100644 index 00000000000..ab0b2002a3a Binary files /dev/null and b/server/sonar-web/public/fonts/Inter/Inter-ThinItalic.woff2 differ diff --git a/server/sonar-web/public/fonts/Inter/inter.css b/server/sonar-web/public/fonts/Inter/inter.css new file mode 100644 index 00000000000..f434cf0582d --- /dev/null +++ b/server/sonar-web/public/fonts/Inter/inter.css @@ -0,0 +1,134 @@ +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 100; + font-display: swap; + src: url('/fonts/Inter/Inter-Thin.woff2?v=3.19') format('woff2'); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 100; + font-display: swap; + src: url('/fonts/Inter/Inter-ThinItalic.woff2?v=3.19') format('woff2'); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 200; + font-display: swap; + src: url('/fonts/Inter/Inter-ExtraLight.woff2?v=3.19') format('woff2'); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 200; + font-display: swap; + src: url('/fonts/Inter/Inter-ExtraLightItalic.woff2?v=3.19') format('woff2'); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url('/fonts/Inter/Inter-Light.woff2?v=3.19') format('woff2'); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 300; + font-display: swap; + src: url('/fonts/Inter/Inter-LightItalic.woff2?v=3.19') format('woff2'); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('/fonts/Inter/Inter-Regular.woff2?v=3.19') format('woff2'); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 400; + font-display: swap; + src: url('/fonts/Inter/Inter-Italic.woff2?v=3.19') format('woff2'); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('/fonts/Inter/Inter-Medium.woff2?v=3.19') format('woff2'); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 500; + font-display: swap; + src: url('/fonts/Inter/Inter-MediumItalic.woff2?v=3.19') format('woff2'); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url('/fonts/Inter/Inter-SemiBold.woff2?v=3.19') format('woff2'); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 600; + font-display: swap; + src: url('/fonts/Inter/Inter-SemiBoldItalic.woff2?v=3.19') format('woff2'); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('/fonts/Inter/Inter-Bold.woff2?v=3.19') format('woff2'); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 700; + font-display: swap; + src: url('/fonts/Inter/Inter-BoldItalic.woff2?v=3.19') format('woff2'); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 800; + font-display: swap; + src: url('/fonts/Inter/Inter-ExtraBold.woff2?v=3.19') format('woff2'); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 800; + font-display: swap; + src: url('/fonts/Inter/Inter-ExtraBoldItalic.woff2?v=3.19') format('woff2'); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 900; + font-display: swap; + src: url('/fonts/Inter/Inter-Black.woff2?v=3.19') format('woff2'); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 900; + font-display: swap; + src: url('/fonts/Inter/Inter-BlackItalic.woff2?v=3.19') format('woff2'); +} diff --git a/server/sonar-web/src/main/js/app/styles/init/base.css b/server/sonar-web/src/main/js/app/styles/init/base.css index 985e1baf773..ac1826c2bcd 100644 --- a/server/sonar-web/src/main/js/app/styles/init/base.css +++ b/server/sonar-web/src/main/js/app/styles/init/base.css @@ -17,7 +17,6 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - @tailwind base; @tailwind components; @tailwind utilities; diff --git a/server/sonar-web/src/main/js/app/styles/sonar.ts b/server/sonar-web/src/main/js/app/styles/sonar.ts index d4b3d4351d9..b62de46e3a6 100644 --- a/server/sonar-web/src/main/js/app/styles/sonar.ts +++ b/server/sonar-web/src/main/js/app/styles/sonar.ts @@ -20,6 +20,8 @@ /* * The esbuild postcss plugin fails to handle CSS `@import` */ +import '../../../../../public/fonts/Inter/inter.css'; + import './components/badges.css'; import './components/boxed-group.css'; import './components/columns.css'; diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle index 1ee3a5be18f..aaebfb4c7d4 100644 --- a/sonar-application/build.gradle +++ b/sonar-application/build.gradle @@ -327,7 +327,7 @@ task zip(type: Zip, dependsOn: [configurations.compileClasspath, downloadElastic // Check the size of the archive zip.doLast { def minLength = 320000000 - def maxLength = 355000000 + def maxLength = 357000000 def length = archiveFile.get().asFile.length() if (length < minLength) diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java b/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java index 5da0f634a6a..e635dd3839a 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java @@ -56,6 +56,7 @@ public final class MediaTypes { private static final String TIFF = "image/tiff"; private static final String TGZ = "application/tgz"; private static final String TSV = "text/tab-separated-values"; + private static final String WOFF2 = "application/font-woff2"; private static final String XLS = "application/vnd.ms-excel"; private static final String XSLT = "application/xslt+xml"; @@ -90,6 +91,7 @@ public final class MediaTypes { MAP.put("html", HTML); MAP.put("css", CSS); MAP.put("tsv", TSV); + MAP.put("woff2", WOFF2); } private MediaTypes() {