scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2026-01-07 00:36:08 +08:00
Code Issues Projects Releases Packages Wiki Activity

Font fix + default label icon fix [SCI-8366]

Browse source
This commit is contained in:
Martin Artnik 2023-06-12 11:20:33 +02:00
parent 27c2850f49
commit 7dfbc960e3
8 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/label_templates/label_templates_datatable.js
View file

@ -20,7 +20,7 @@
}
function renderDefaultTemplateHTML(data) {
return data ? '<i class="sn-icon sn-icon-dashboard"></i>' : '';
return data ? '<i class="fas fa-thumbtack"></i>' : '';
}
function renderNameHTML(data, type, row) {

1
app/javascript/packs/fonts.js Normal file
View file

@ -0,0 +1 @@
require('@fontsource/inter');

2
app/services/toolbars/label_templates_service.rb
View file

@ -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
}

2
app/views/label_templates/index.html.erb
View file

@ -33,7 +33,7 @@
<span class="sci-checkbox-label"></span>
</div>
</th>
<th id="label-template-selected"><i class="sn-icon sn-icon-dashboard"></i></th>
<th id="label-template-selected"><i class="fas fa-thumbtack"></i></th>
<th id="label-template-name"><%= t('label_templates.index.thead_name') %></th>
<th id="label-template-format"><%= t('label_templates.index.format') %></th>
<th id="label-template-description"><%= t('label_templates.index.description') %></th>

1
app/views/layouts/application.html.erb
View file

@ -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' %>

1
config/webpack/webpack.config.js
View file

@ -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',

1
package.json
View file

@ -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",

5
yarn.lock
View file

@ -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"