diff --git a/app/assets/stylesheets/application.sass.scss b/app/assets/stylesheets/application.sass.scss index 5b57a8e9..cfaa9f5e 100644 --- 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 index 66f43225..4030d66b 100644 --- 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 index 7adf3802..2ae77f1e 100644 --- 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 index 3c635ffd..624b42a4 100644 --- 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 new file mode 100644 index 00000000..bcf3df1c --- /dev/null +++ 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; +} \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 76c226ea..0ae83b98 100644 --- 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" %> + + + <%= stylesheet_link_tag "https://fonts.googleapis.com/css2?family=Source+Sans+3:wght@300;400&display=swap" %> <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>