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

Merge pull request #5399 from aignatov-bio/ai-sci-8170-switch-font-to-inter

Browse source 
Switch to inter font [SCI-8170]
This commit is contained in:
aignatov-bio 2023-06-06 12:50:57 +02:00 • committed by GitHub
commit 19956eb145
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/layouts/print_protocol.scss
View file

@ -20,7 +20,7 @@
} }
body { body {
font-family: Lato, "Open Sans", Arial, Helvetica, sans-serif; font-family: Inter, "Open Sans", Arial, Helvetica, sans-serif;
font-size: 16px; font-size: 16px;
-webkit-print-color-adjust: exact; -webkit-print-color-adjust: exact;
print-color-adjust: exact; print-color-adjust: exact;

1
app/assets/stylesheets/marvinjs.scss
View file

@ -96,7 +96,6 @@
.sketch-name { .sketch-name {
color: $brand-primary; color: $brand-primary;
font-family: Lato;
font-size: 16px; font-size: 16px;
line-height: 18px; line-height: 18px;
margin: 10px auto; margin: 10px auto;

1
app/assets/stylesheets/projects.scss
View file

@ -556,7 +556,6 @@ li.module-hover {
width: 568px; width: 568px;
height: 30px; height: 30px;
font-family: 'Lato';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 16px;

4
app/assets/stylesheets/shared_styles/constants/fonts.scss
View file

@ -1,10 +1,10 @@
// scss-lint:disable ImportantRule // scss-lint:disable ImportantRule
$font-family-lato: Lato, "Open Sans", Arial, Helvetica, sans-serif; $font-family-inter: Inter;
$font-family-sans-serif: "Open Sans", Arial, Helvetica, sans-serif; $font-family-sans-serif: "Open Sans", Arial, Helvetica, sans-serif;
$font-family-serif: Georgia, "Times New Roman", Times, serif; $font-family-serif: Georgia, "Times New Roman", Times, serif;
$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
$font-family-base: $font-family-lato; $font-family-base: $font-family-inter;
$font-family-icons: "Font Awesome 5 Free"; $font-family-icons: "Font Awesome 5 Free";
$font-size-base: 16px; $font-size-base: 16px;
$headings-font-weight: bold; $headings-font-weight: bold;

1
app/assets/stylesheets/steps/step.scss
View file

@ -154,7 +154,6 @@
bottom: 17px; bottom: 17px;
width: 356px; width: 356px;
height: 15px; height: 15px;
font-family: 'Lato';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-size: 10px; font-size: 10px;

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

@ -1 +0,0 @@
require('typeface-lato');

2
app/javascript/packs/tiny_mce.js vendored
View file

@ -40,7 +40,7 @@ import contentCss from '!!raw-loader!tinymce/skins/content/default/content.min.c
import contentUiCss from '!!raw-loader!tinymce/skins/ui/tinymce-5/content.min.css'; import contentUiCss from '!!raw-loader!tinymce/skins/ui/tinymce-5/content.min.css';
const contentPStyle = `p { margin: 0; padding: 0;}`; const contentPStyle = `p { margin: 0; padding: 0;}`;
const contentBodyStyle = `body { font-family: Lato, "Open Sans", Arial, Helvetica, sans-serif }`; const contentBodyStyle = `body { font-family: Inter, "Open Sans", Arial, Helvetica, sans-serif }`;
const contentStyle = [contentCss, contentUiCss, contentBodyStyle, contentPStyle].map((s) => s.toString()).join('\n'); const contentStyle = [contentCss, contentUiCss, contentBodyStyle, contentPStyle].map((s) => s.toString()).join('\n');
// Optional pre-initialization method // Optional pre-initialization method

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

@ -33,7 +33,6 @@
<%= favicon_link_tag "favicon-16.png", type: "image/png", size: "16x16" %> <%= favicon_link_tag "favicon-16.png", type: "image/png", size: "16x16" %>
<%= favicon_link_tag "favicon-32.png", type: "image/png", size: "32x32" %> <%= favicon_link_tag "favicon-32.png", type: "image/png", size: "32x32" %>
<%= favicon_link_tag "favicon-48.png", type: "image/png", size: "48x48" %> <%= favicon_link_tag "favicon-48.png", type: "image/png", size: "48x48" %>
<%= stylesheet_link_tag 'fonts', id: 'font-css-pack' %>
<%= stylesheet_link_tag 'fontawesome' %> <%= stylesheet_link_tag 'fontawesome' %>
<%= stylesheet_link_tag 'prism' %> <%= stylesheet_link_tag 'prism' %>

2
config/initializers/constants.rb
View file

@ -195,7 +195,7 @@ class Constants
COLOR_BLACK = '#231f20'.freeze # $color-black COLOR_BLACK = '#231f20'.freeze # $color-black
# Fonts # Fonts
FONT_FAMILY_BASE = 'Lato,"Open Sans",Arial,Helvetica,sans-serif;'.freeze # $font-family-base FONT_FAMILY_BASE = 'Inter,"Open Sans",Arial,Helvetica,sans-serif;'.freeze # $font-family-base
#============================================================================= #=============================================================================
# External URLs # External URLs

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

@ -12,7 +12,6 @@ const mode = process.env.NODE_ENV === 'development' ? 'development' : 'productio
const entryList = { const entryList = {
application_pack: './app/javascript/packs/application.js', application_pack: './app/javascript/packs/application.js',
emoji_button: './app/javascript/packs/emoji_button.js', emoji_button: './app/javascript/packs/emoji_button.js',
fonts: './app/javascript/packs/fonts.js',
fontawesome: './app/javascript/packs/fontawesome.scss', fontawesome: './app/javascript/packs/fontawesome.scss',
prism: './app/javascript/packs/prism.js', prism: './app/javascript/packs/prism.js',
tiny_mce: './app/javascript/packs/tiny_mce.js', tiny_mce: './app/javascript/packs/tiny_mce.js',

1
package.json
View file

@ -80,7 +80,6 @@
"tui-color-picker": "^2.2.0", "tui-color-picker": "^2.2.0",
"tui-image-editor": "github:biosistemika/tui.image-editor#3_15_2_updated", "tui-image-editor": "github:biosistemika/tui.image-editor#3_15_2_updated",
"twemoji": "^12.1.4", "twemoji": "^12.1.4",
"typeface-lato": "^0.0.75",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-loader": "^15.9.1", "vue-loader": "^15.9.1",
"vue-template-compiler": "^2.6.12", "vue-template-compiler": "^2.6.12",

5
yarn.lock
View file

@ -6821,11 +6821,6 @@ typed-array-length@^1.0.4:
for-each "^0.3.3" for-each "^0.3.3"
is-typed-array "^1.1.9" is-typed-array "^1.1.9"
typeface-lato@^0.0.75:
version "0.0.75"
resolved "https://registry.yarnpkg.com/typeface-lato/-/typeface-lato-0.0.75.tgz#8aa11c5611dc38416837c089b265a2abd1f7dd31"
integrity sha512-iA5uJD4PSTyIE4BDiSOexQeXkDkiJuX4Hu3wh3saJ06EB2TvJayab1Lbbmqq2je/LQv7KCQZHZmC0k4hedd8sw==
typescript-compiler@^1.4.1-2: typescript-compiler@^1.4.1-2:
version "1.4.1-2" version "1.4.1-2"
resolved "https://registry.yarnpkg.com/typescript-compiler/-/typescript-compiler-1.4.1-2.tgz#ba4f7db22d91534a1929d90009dce161eb72fd3f" resolved "https://registry.yarnpkg.com/typescript-compiler/-/typescript-compiler-1.4.1-2.tgz#ba4f7db22d91534a1929d90009dce161eb72fd3f"