Merge branch 'no-oxygen' into 'master'

Replace Oxygen-Sans with Noto Sans font on visual_review_toolbar See merge request gitlab-org/gitlab-ce!31561

Merge branch 'no-oxygen' into 'master'
Replace Oxygen-Sans with Noto Sans font on visual_review_toolbar See merge request gitlab-org/gitlab-ce!31561
95ba178d · Annabel Dunstone Gray · 1ca8c808 · 045ce930 · 95ba178d
Commit 95ba178d authored Aug 08, 2019 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/assets/javascripts/visual_review_toolbar/styles/toolbar.css ...sets/javascripts/visual_review_toolbar/styles/toolbar.css +1 -1

No files found.
--- a/app/assets/javascripts/visual_review_toolbar/styles/toolbar.css
+++ b/app/assets/javascripts/visual_review_toolbar/styles/toolbar.css
@@ -42,7 +42,7 @@
  position: fixed;
  bottom: 1rem;
  right: 1rem;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell,
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Noto Sans', Ubuntu, Cantarell,
  'Helvetica Neue', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
  'Noto Color Emoji';
  font-size: .8rem;