diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-08-08 14:07:54 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-08-08 14:07:54 +0000 |
| commit | 95ba178dcdf16bd3f8c4f07cb2efa2b81b2913d1 (patch) | |
| tree | 7b2d7463219acba76736b1ff361bb312f59d1e12 | |
| parent | 1ca8c808f4b2571277d3e9980c12763479e17bf9 (diff) | |
| parent | 045ce9305f6b805e9f9b5bbc13b13ad345530e64 (diff) | |
| download | gitlab-ce-95ba178dcdf16bd3f8c4f07cb2efa2b81b2913d1.tar.gz | |
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
| -rw-r--r-- | app/assets/javascripts/visual_review_toolbar/styles/toolbar.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/visual_review_toolbar/styles/toolbar.css b/app/assets/javascripts/visual_review_toolbar/styles/toolbar.css index e5732fd5d93..d1a8d66ef40 100644 --- 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; |