diff --git a/app/assets/javascripts/label_templates/label_templates_datatable.js b/app/assets/javascripts/label_templates/label_templates_datatable.js
index f9b212e0e..0c153a9d2 100644
--- a/app/assets/javascripts/label_templates/label_templates_datatable.js
+++ b/app/assets/javascripts/label_templates/label_templates_datatable.js
@@ -20,7 +20,7 @@
}
function renderDefaultTemplateHTML(data) {
- return data ? '' : '';
+ return data ? '' : '';
}
function renderNameHTML(data, type, row) {
diff --git a/app/javascript/packs/fonts.js b/app/javascript/packs/fonts.js
new file mode 100644
index 000000000..24846fae9
--- /dev/null
+++ b/app/javascript/packs/fonts.js
@@ -0,0 +1 @@
+require('@fontsource/inter');
diff --git a/app/services/toolbars/label_templates_service.rb b/app/services/toolbars/label_templates_service.rb
index 1f1e0f61c..3dae82c71 100644
--- a/app/services/toolbars/label_templates_service.rb
+++ b/app/services/toolbars/label_templates_service.rb
@@ -55,7 +55,7 @@ module Toolbars
{
name: 'set_as_default',
label: I18n.t("label_templates.index.toolbar.set_#{@label_templates.first.type}_default"),
- icon: 'sn-icon sn-icon-dashboard',
+ icon: 'fas fa-thumbtack',
button_id: 'setZplDefaultLabelTemplate',
type: :legacy
}
diff --git a/app/views/label_templates/index.html.erb b/app/views/label_templates/index.html.erb
index 9d3a0782d..aa0abf321 100644
--- a/app/views/label_templates/index.html.erb
+++ b/app/views/label_templates/index.html.erb
@@ -33,7 +33,7 @@
-
|
+ |
<%= t('label_templates.index.thead_name') %> |
<%= t('label_templates.index.format') %> |
<%= t('label_templates.index.description') %> |
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e1a41675e..475465c1e 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -34,6 +34,7 @@
<%= favicon_link_tag "favicon-32.png", type: "image/png", size: "32x32" %>
<%= favicon_link_tag "favicon-48.png", type: "image/png", size: "48x48" %>
<%= stylesheet_link_tag 'fontawesome' %>
+ <%= stylesheet_link_tag 'fonts', id: 'font-css-pack' %>
<%= stylesheet_link_tag 'prism' %>
diff --git a/config/webpack/webpack.config.js b/config/webpack/webpack.config.js
index b2bbee377..93863fd68 100644
--- a/config/webpack/webpack.config.js
+++ b/config/webpack/webpack.config.js
@@ -11,6 +11,7 @@ const mode = process.env.NODE_ENV === 'development' ? 'development' : 'productio
const entryList = {
application_pack: './app/javascript/packs/application.js',
+ fonts: './app/javascript/packs/fonts.js',
emoji_button: './app/javascript/packs/emoji_button.js',
fontawesome: './app/javascript/packs/fontawesome.scss',
prism: './app/javascript/packs/prism.js',
diff --git a/package.json b/package.json
index 8f45e4ae4..659a6fd2b 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
"@babel/core": "^7.21.3",
"@babel/plugin-transform-runtime": "^7.21.0",
"@babel/preset-env": "^7.20.2",
+ "@fontsource/inter": "^5.0.3",
"@fortawesome/fontawesome-free": "^5.2.0",
"@joeattardi/emoji-button": "^4.6.2",
"ajv": "6.12.6",
diff --git a/yarn.lock b/yarn.lock
index 94a1acdfd..e0de4f170 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -959,6 +959,11 @@
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.39.0.tgz#58b536bcc843f4cd1e02a7e6171da5c040f4d44b"
integrity sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==
+"@fontsource/inter@^5.0.3":
+ version "5.0.3"
+ resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-5.0.3.tgz#30a1c0b974e29d72eddaec0c45655597ffa0bf80"
+ integrity sha512-JJvh5xht71F6e0E5r2+Ffu8g+CYAxMvnGJm9ZMg5IIjy8UwxLp+8C99TgPJupdEyBpEJv0wuMG2Rd183z/bV8g==
+
"@fortawesome/fontawesome-common-types@^0.2.36":
version "0.2.36"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz#b44e52db3b6b20523e0c57ef8c42d315532cb903"