瀏覽代碼

Fixes #17511: Restore consistent font support for non-Latin characters

Jeremy Stretch 1 年之前
父節點
當前提交
b4dd71d578
共有 50 個文件被更改,包括 9 次插入10 次删除
  1. 二進制
      netbox/project-static/dist/Inter-Black-7VL4YR6G.woff
  2. 二進制
      netbox/project-static/dist/Inter-Black-NU3KAVPI.woff2
  3. 二進制
      netbox/project-static/dist/Inter-BlackItalic-4BVAVUVI.woff2
  4. 二進制
      netbox/project-static/dist/Inter-BlackItalic-HJLUEYVW.woff
  5. 二進制
      netbox/project-static/dist/Inter-Bold-6AVOS7AV.woff2
  6. 二進制
      netbox/project-static/dist/Inter-Bold-RTIBL5DO.woff
  7. 二進制
      netbox/project-static/dist/Inter-BoldItalic-AID2XGS3.woff2
  8. 二進制
      netbox/project-static/dist/Inter-BoldItalic-UU7SOVRI.woff
  9. 二進制
      netbox/project-static/dist/Inter-ExtraBold-B5RSZK6R.woff
  10. 二進制
      netbox/project-static/dist/Inter-ExtraBold-VAPCTO5F.woff2
  11. 二進制
      netbox/project-static/dist/Inter-ExtraBoldItalic-R7DLWYIK.woff
  12. 二進制
      netbox/project-static/dist/Inter-ExtraBoldItalic-W26CJYY7.woff2
  13. 二進制
      netbox/project-static/dist/Inter-ExtraLight-A7NHN7KT.woff
  14. 二進制
      netbox/project-static/dist/Inter-ExtraLight-DVW3SATI.woff2
  15. 二進制
      netbox/project-static/dist/Inter-ExtraLightItalic-KXZYPKOE.woff2
  16. 二進制
      netbox/project-static/dist/Inter-ExtraLightItalic-SKGXKLLA.woff
  17. 二進制
      netbox/project-static/dist/Inter-Italic-GHDVOOKA.woff
  18. 二進制
      netbox/project-static/dist/Inter-Italic-RW2ZALTO.woff2
  19. 二進制
      netbox/project-static/dist/Inter-Light-ARG5Y6MT.woff
  20. 二進制
      netbox/project-static/dist/Inter-Light-XBRUIIRZ.woff2
  21. 二進制
      netbox/project-static/dist/Inter-LightItalic-4OWY6V5R.woff2
  22. 二進制
      netbox/project-static/dist/Inter-LightItalic-WFS25IQZ.woff
  23. 二進制
      netbox/project-static/dist/Inter-Medium-JV63DMR7.woff2
  24. 二進制
      netbox/project-static/dist/Inter-Medium-KH2CGZVE.woff
  25. 二進制
      netbox/project-static/dist/Inter-MediumItalic-P7H6BBYU.woff2
  26. 二進制
      netbox/project-static/dist/Inter-MediumItalic-PO2E4FIG.woff
  27. 二進制
      netbox/project-static/dist/Inter-Regular-373XMOLM.woff2
  28. 二進制
      netbox/project-static/dist/Inter-Regular-DR3VC6YG.woff
  29. 二進制
      netbox/project-static/dist/Inter-SemiBold-TJ6HPMMH.woff
  30. 二進制
      netbox/project-static/dist/Inter-SemiBold-UMRILHOG.woff2
  31. 二進制
      netbox/project-static/dist/Inter-SemiBoldItalic-ABO2DCC7.woff2
  32. 二進制
      netbox/project-static/dist/Inter-SemiBoldItalic-DM4JJSFU.woff
  33. 二進制
      netbox/project-static/dist/Inter-Thin-MEKOZMGA.woff
  34. 二進制
      netbox/project-static/dist/Inter-Thin-TCINWRKS.woff2
  35. 二進制
      netbox/project-static/dist/Inter-ThinItalic-WRULPH3M.woff2
  36. 二進制
      netbox/project-static/dist/Inter-ThinItalic-ZFOL6JFL.woff
  37. 二進制
      netbox/project-static/dist/Inter-italic.var-7LS4VCXC.woff2
  38. 二進制
      netbox/project-static/dist/Inter-roman.var-EDENVCUS.woff2
  39. 二進制
      netbox/project-static/dist/Inter.var-FTIQFLGO.woff2
  40. 0 0
      netbox/project-static/dist/netbox-external.css
  41. 0 0
      netbox/project-static/dist/netbox.css
  42. 二進制
      netbox/project-static/dist/plus-jakarta-sans-cyrillic-ext-wght-normal-3FNWYSHQ.woff2
  43. 二進制
      netbox/project-static/dist/plus-jakarta-sans-latin-ext-wght-normal-WWG75Y4U.woff2
  44. 二進制
      netbox/project-static/dist/plus-jakarta-sans-latin-wght-normal-S6EFCQOU.woff2
  45. 二進制
      netbox/project-static/dist/plus-jakarta-sans-vietnamese-wght-normal-NNXUV3SN.woff2
  46. 1 1
      netbox/project-static/package.json
  47. 1 2
      netbox/project-static/styles/_variables.scss
  48. 1 1
      netbox/project-static/styles/external.scss
  49. 5 5
      netbox/project-static/yarn.lock
  50. 1 1
      netbox/templates/generic/_base.html

二進制
netbox/project-static/dist/Inter-Black-7VL4YR6G.woff


二進制
netbox/project-static/dist/Inter-Black-NU3KAVPI.woff2


二進制
netbox/project-static/dist/Inter-BlackItalic-4BVAVUVI.woff2


二進制
netbox/project-static/dist/Inter-BlackItalic-HJLUEYVW.woff


二進制
netbox/project-static/dist/Inter-Bold-6AVOS7AV.woff2


二進制
netbox/project-static/dist/Inter-Bold-RTIBL5DO.woff


二進制
netbox/project-static/dist/Inter-BoldItalic-AID2XGS3.woff2


二進制
netbox/project-static/dist/Inter-BoldItalic-UU7SOVRI.woff


二進制
netbox/project-static/dist/Inter-ExtraBold-B5RSZK6R.woff


二進制
netbox/project-static/dist/Inter-ExtraBold-VAPCTO5F.woff2


二進制
netbox/project-static/dist/Inter-ExtraBoldItalic-R7DLWYIK.woff


二進制
netbox/project-static/dist/Inter-ExtraBoldItalic-W26CJYY7.woff2


二進制
netbox/project-static/dist/Inter-ExtraLight-A7NHN7KT.woff


二進制
netbox/project-static/dist/Inter-ExtraLight-DVW3SATI.woff2


二進制
netbox/project-static/dist/Inter-ExtraLightItalic-KXZYPKOE.woff2


二進制
netbox/project-static/dist/Inter-ExtraLightItalic-SKGXKLLA.woff


二進制
netbox/project-static/dist/Inter-Italic-GHDVOOKA.woff


二進制
netbox/project-static/dist/Inter-Italic-RW2ZALTO.woff2


二進制
netbox/project-static/dist/Inter-Light-ARG5Y6MT.woff


二進制
netbox/project-static/dist/Inter-Light-XBRUIIRZ.woff2


二進制
netbox/project-static/dist/Inter-LightItalic-4OWY6V5R.woff2


二進制
netbox/project-static/dist/Inter-LightItalic-WFS25IQZ.woff


二進制
netbox/project-static/dist/Inter-Medium-JV63DMR7.woff2


二進制
netbox/project-static/dist/Inter-Medium-KH2CGZVE.woff


二進制
netbox/project-static/dist/Inter-MediumItalic-P7H6BBYU.woff2


二進制
netbox/project-static/dist/Inter-MediumItalic-PO2E4FIG.woff


二進制
netbox/project-static/dist/Inter-Regular-373XMOLM.woff2


二進制
netbox/project-static/dist/Inter-Regular-DR3VC6YG.woff


二進制
netbox/project-static/dist/Inter-SemiBold-TJ6HPMMH.woff


二進制
netbox/project-static/dist/Inter-SemiBold-UMRILHOG.woff2


二進制
netbox/project-static/dist/Inter-SemiBoldItalic-ABO2DCC7.woff2


二進制
netbox/project-static/dist/Inter-SemiBoldItalic-DM4JJSFU.woff


二進制
netbox/project-static/dist/Inter-Thin-MEKOZMGA.woff


二進制
netbox/project-static/dist/Inter-Thin-TCINWRKS.woff2


二進制
netbox/project-static/dist/Inter-ThinItalic-WRULPH3M.woff2


二進制
netbox/project-static/dist/Inter-ThinItalic-ZFOL6JFL.woff


二進制
netbox/project-static/dist/Inter-italic.var-7LS4VCXC.woff2


二進制
netbox/project-static/dist/Inter-roman.var-EDENVCUS.woff2


二進制
netbox/project-static/dist/Inter.var-FTIQFLGO.woff2


文件差異過大導致無法顯示
+ 0 - 0
netbox/project-static/dist/netbox-external.css


文件差異過大導致無法顯示
+ 0 - 0
netbox/project-static/dist/netbox.css


二進制
netbox/project-static/dist/plus-jakarta-sans-cyrillic-ext-wght-normal-3FNWYSHQ.woff2


二進制
netbox/project-static/dist/plus-jakarta-sans-latin-ext-wght-normal-WWG75Y4U.woff2


二進制
netbox/project-static/dist/plus-jakarta-sans-latin-wght-normal-S6EFCQOU.woff2


二進制
netbox/project-static/dist/plus-jakarta-sans-vietnamese-wght-normal-NNXUV3SN.woff2


+ 1 - 1
netbox/project-static/package.json

@@ -22,7 +22,6 @@
     "validate:formatting:scripts": "prettier -c src/**/*.ts"
   },
   "dependencies": {
-    "@fontsource-variable/plus-jakarta-sans": "^5.1.0",
     "@mdi/font": "7.4.47",
     "@tabler/core": "1.0.0-beta21",
     "bootstrap": "5.3.3",
@@ -33,6 +32,7 @@
     "query-string": "9.1.0",
     "sass": "1.78.0",
     "tom-select": "2.3.1",
+    "typeface-inter": "3.18.1",
     "typeface-roboto-mono": "1.1.13"
   },
   "devDependencies": {

+ 1 - 2
netbox/project-static/styles/_variables.scss

@@ -1,10 +1,9 @@
 // Global variables
 
 // Set base fonts
-$font-family-sans-serif: 'Plus Jakarta Sans Variable', system-ui, sans-serif;
+$font-family-sans-serif: 'Inter', system-ui, sans-serif;
 // See https://github.com/tabler/tabler/issues/1812
 $font-family-monospace: 'Roboto Mono';
-$font-weight-base: 500;
 
 // Set the navigation sidebar width
 $sidebar-width: 18rem;

+ 1 - 1
netbox/project-static/styles/external.scss

@@ -4,5 +4,5 @@
 @import 'gridstack/dist/gridstack.min.css';
 
 // Fonts
+@import url("../node_modules/typeface-inter/inter.css");
 @import url("../node_modules/typeface-roboto-mono/index.css");
-@import url("../node_modules/@fontsource-variable/plus-jakarta-sans/index.css");

+ 5 - 5
netbox/project-static/yarn.lock

@@ -200,11 +200,6 @@
   resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.2.tgz#d8bae93ac8b815b2bd7a98078cf91e2724ef11e5"
   integrity sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==
 
-"@fontsource-variable/plus-jakarta-sans@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@fontsource-variable/plus-jakarta-sans/-/plus-jakarta-sans-5.1.0.tgz#9dd5aa72277c43d408f6e34cd658d823fbef1fe1"
-  integrity sha512-K7o2GO7/quVFFyfjTqYZu0ng4KJGf60KSAGbvUWwKuH+/Giyl6Qe/EqnGLcjrl9AmXZzTvtRB1xpkASn8FNFoQ==
-
 "@graphiql/plugin-explorer@3.2.2":
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/@graphiql/plugin-explorer/-/plugin-explorer-3.2.2.tgz#973d6015b6db15041902e95c3e4b746473313eb6"
@@ -2852,6 +2847,11 @@ typed-array-length@^1.0.6:
     is-typed-array "^1.1.13"
     possible-typed-array-names "^1.0.0"
 
+typeface-inter@3.18.1:
+  version "3.18.1"
+  resolved "https://registry.yarnpkg.com/typeface-inter/-/typeface-inter-3.18.1.tgz#24cccdf29923f318589783997be20a662cd3ab9c"
+  integrity sha512-c+TBanYFCvmg3j5vPk+zxK4ocMZbPxMEmjnwG7rPQoV87xvQ6b07VbAOC0Va0XBbbZCGw6cWNeFuLeg1YQru3Q==
+
 typeface-roboto-mono@1.1.13:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/typeface-roboto-mono/-/typeface-roboto-mono-1.1.13.tgz#2af8662db8f9119c00efd55d6ed8877d2a69ec94"

+ 1 - 1
netbox/templates/generic/_base.html

@@ -10,7 +10,7 @@
 
           {# Title #}
           <div>
-            <h1 class="page-title mt-1 mb-2">{% block title %}{% endblock title %}</h1>
+            <h1 class="page-title">{% block title %}{% endblock title %}</h1>
             {% block subtitle %}{% endblock %}
           </div>
 

部分文件因文件數量過多而無法顯示