Merge pull request #3284 from DMPRoadmap/domo-arigato

Switched Google font used in PDFs from Helvetica to Roboto
DMPRoadmap · Jan 27, 2023 · 1b816d9 · 1b816d9
2 parents 00459b6 + cfc9b39
commit 1b816d9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Added popover for org profile page and added explanation for public plan
 ### Fixed
 
+- Updated sans-serif font used in PDF downloads to Roboto since Google API no longer offers Helvetica
 - Fixed discrepencies with default/max per_page values for API and UI pagination
 - Updated JS that used to call the TinyMCE `setMode()` function so that it now calls `mode.set()` because the former is now deprecated.
 

diff --git a/app/helpers/exports_helper.rb b/app/helpers/exports_helper.rb
@@ -10,7 +10,7 @@ module ExportsHelper
   }.freeze
 
   def font_face
-    @formatting[:font_face].presence || 'Arial, Helvetica, Sans-Serif'
+    @formatting[:font_face].presence || 'Roboto, Arial, Sans-Serif'
   end
 
   def font_size

diff --git a/app/models/settings/template.rb b/app/models/settings/template.rb
@@ -18,7 +18,7 @@ module Settings
   class Template < RailsSettings::SettingObject
     VALID_FONT_FACES = [
       '"Times New Roman", Times, Serif',
-      'Arial, Helvetica, Sans-Serif'
+      'Roboto, Arial, Sans-Serif'
     ].freeze
 
     VALID_FONT_SIZE_RANGE = (8..14).freeze

diff --git a/app/views/shared/export/_plan_styling.erb b/app/views/shared/export/_plan_styling.erb
@@ -1,5 +1,5 @@
 <style>
-  @import 'https://fonts.googleapis.com/css?family=<%= font_face.downcase.include?('times') ? 'Times' : 'Helvetica' %>';
+  @import 'https://fonts.googleapis.com/css?family=<%= font_face.downcase.include?('times') ? 'Times' : 'Roboto' %>';
 
   body {
     font-family: <%= font_face %>;
@@ -58,5 +58,5 @@
     }
     .bold {
       font-weight: bold;
-    }  
+    }
 </style>