Merge pull request #878 from sul-dlss/fonts

Upgrade to Source Sans 3
sul-dlss · Dec 7, 2023 · be53e6a · be53e6a
2 parents c5605ab + 2d620d0
commit be53e6a
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/app/assets/stylesheets/application.sass.scss b/app/assets/stylesheets/application.sass.scss
@@ -1,4 +1,3 @@
-// SUL Style Variables/Mixins
 @import 'deja-vu-font';
 @import 'sul-variables';
 @import 'searchworks-mixins';

diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss
@@ -6,10 +6,6 @@ a {
   }
 }
 
-body {
-  font-family: 'Source Sans Pro', 'Arial Unicode MS', Helvetica, sans-serif;
-}
-
 .su-underline {
 	text-decoration: none;
   border-bottom: 1px dotted $sul-link-color-border;

diff --git a/app/assets/stylesheets/bootstrap-variables.scss b/app/assets/stylesheets/bootstrap-variables.scss
@@ -3,6 +3,9 @@
 // Body
 $body-bg: $sul-body-bg;
 
+// Typography
+$font-family-sans-serif: 'Source Sans 3', 'Arial Unicode MS', Helvetica, sans-serif;
+
 // Text / Links
 $text-color: $sul-text-color;
 $link-color: $sul-link-color;

diff --git a/app/assets/stylesheets/modules/top-navbar.scss b/app/assets/stylesheets/modules/top-navbar.scss
@@ -37,7 +37,7 @@
 }
 
 .sdr-brand {
-  font-family: Source Sans Pro;
+  font-family: 'Source Sans 3';
   letter-spacing: normal;
   margin-top: 0;
   padding: 0.275em 0;

diff --git a/app/assets/stylesheets/sul-styles.scss b/app/assets/stylesheets/sul-styles.scss
@@ -0,0 +1,12 @@
+@import 'sul-styles/su_web_colors';
+@import 'sul-styles/su_primary_colors';
+@import 'sul-styles/variables';
+@import 'sul-styles/sul_footer';
+
+.sdr-brand {
+  font-family: 'Source Sans 3';
+  letter-spacing: normal;
+  margin-top: 0;
+  padding-bottom: 0.3em;
+  color: #fff;
+}
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -28,7 +28,9 @@
     <%= title site: application_name, separator: '|', reverse: true %>
 
     <%= favicon_link_tag 'favicon.ico' %>
-    <%= stylesheet_link_tag "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700&display=swap" %>
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <%= stylesheet_link_tag "https://fonts.googleapis.com/css2?family=Source+Sans+3:wght@300;400&display=swap" %>
     <link rel="preload" href="<%= asset_path('DejaVuSans-ExtraLight-webfont.woff') %>" as="font" type="font/woff">
     <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
     <link href="https://www-media.stanford.edu/su-identity/css/su-identity.css" rel="stylesheet">