diff --git a/app/assets/stylesheets/layouts/print_protocol.scss b/app/assets/stylesheets/layouts/print_protocol.scss index adb4fd129..f62c7d903 100644 --- a/app/assets/stylesheets/layouts/print_protocol.scss +++ b/app/assets/stylesheets/layouts/print_protocol.scss @@ -20,7 +20,7 @@ } body { - font-family: Lato, "Open Sans", Arial, Helvetica, sans-serif; + font-family: Inter, "Open Sans", Arial, Helvetica, sans-serif; font-size: 16px; -webkit-print-color-adjust: exact; print-color-adjust: exact; diff --git a/app/assets/stylesheets/marvinjs.scss b/app/assets/stylesheets/marvinjs.scss index 03864593d..a2c729251 100644 --- a/app/assets/stylesheets/marvinjs.scss +++ b/app/assets/stylesheets/marvinjs.scss @@ -96,7 +96,6 @@ .sketch-name { color: $brand-primary; - font-family: Lato; font-size: 16px; line-height: 18px; margin: 10px auto; diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 86642923b..5d4c9fc0a 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -556,7 +556,6 @@ li.module-hover { width: 568px; height: 30px; - font-family: 'Lato'; font-style: normal; font-weight: 400; font-size: 16px; diff --git a/app/assets/stylesheets/shared_styles/constants/fonts.scss b/app/assets/stylesheets/shared_styles/constants/fonts.scss index fb31fead7..d8f6bbdea 100644 --- a/app/assets/stylesheets/shared_styles/constants/fonts.scss +++ b/app/assets/stylesheets/shared_styles/constants/fonts.scss @@ -1,10 +1,10 @@ // 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-serif: Georgia, "Times New Roman", Times, serif; $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-size-base: 16px; $headings-font-weight: bold; diff --git a/app/assets/stylesheets/steps/step.scss b/app/assets/stylesheets/steps/step.scss index 8a6bcc140..19fbf5243 100644 --- a/app/assets/stylesheets/steps/step.scss +++ b/app/assets/stylesheets/steps/step.scss @@ -154,7 +154,6 @@ bottom: 17px; width: 356px; height: 15px; - font-family: 'Lato'; font-style: normal; font-weight: 400; font-size: 10px; diff --git a/app/javascript/packs/fonts.js b/app/javascript/packs/fonts.js deleted file mode 100644 index 9147247fb..000000000 --- a/app/javascript/packs/fonts.js +++ /dev/null @@ -1 +0,0 @@ -require('typeface-lato'); diff --git a/app/javascript/packs/tiny_mce.js b/app/javascript/packs/tiny_mce.js index 4f32ea178..f67c80f8e 100644 --- a/app/javascript/packs/tiny_mce.js +++ b/app/javascript/packs/tiny_mce.js @@ -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'; 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'); // Optional pre-initialization method diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ccada7d98..e1a41675e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -33,7 +33,6 @@ <%= 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-48.png", type: "image/png", size: "48x48" %> - <%= stylesheet_link_tag 'fonts', id: 'font-css-pack' %> <%= stylesheet_link_tag 'fontawesome' %> <%= stylesheet_link_tag 'prism' %> diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb index 0cf987c51..6bca16277 100644 --- a/config/initializers/constants.rb +++ b/config/initializers/constants.rb @@ -195,7 +195,7 @@ class Constants COLOR_BLACK = '#231f20'.freeze # $color-black # 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 diff --git a/config/webpack/webpack.config.js b/config/webpack/webpack.config.js index 747b8438a..b2bbee377 100644 --- a/config/webpack/webpack.config.js +++ b/config/webpack/webpack.config.js @@ -12,7 +12,6 @@ const mode = process.env.NODE_ENV === 'development' ? 'development' : 'productio const entryList = { application_pack: './app/javascript/packs/application.js', emoji_button: './app/javascript/packs/emoji_button.js', - fonts: './app/javascript/packs/fonts.js', fontawesome: './app/javascript/packs/fontawesome.scss', prism: './app/javascript/packs/prism.js', tiny_mce: './app/javascript/packs/tiny_mce.js', diff --git a/package.json b/package.json index 0c71d86be..8f45e4ae4 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,6 @@ "tui-color-picker": "^2.2.0", "tui-image-editor": "github:biosistemika/tui.image-editor#3_15_2_updated", "twemoji": "^12.1.4", - "typeface-lato": "^0.0.75", "vue": "^2.6.11", "vue-loader": "^15.9.1", "vue-template-compiler": "^2.6.12", diff --git a/yarn.lock b/yarn.lock index dc46a522a..94a1acdfd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6821,11 +6821,6 @@ typed-array-length@^1.0.4: for-each "^0.3.3" 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: version "1.4.1-2" resolved "https://registry.yarnpkg.com/typescript-compiler/-/typescript-compiler-1.4.1-2.tgz#ba4f7db22d91534a1929d90009dce161eb72fd3f"