From d939aaf46f0ba45e6bc3fa7cc773a3b24ed7ad83 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 15 May 2019 08:14:09 +0000 Subject: Prefer Noto Sans over Oxygen-Sans Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/framework/variables.scss | 2 +- changelogs/unreleased/dz-patch-58.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/dz-patch-58.yml diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 4a034e1e547..9c6c42c3990 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -432,7 +432,7 @@ $diff-jagged-border-gradient-color: darken($white-normal, 8%); */ $monospace-font: 'Menlo', 'DejaVu Sans Mono', 'Liberation Mono', 'Consolas', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace; -$regular-font: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, +$regular-font: -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'; diff --git a/changelogs/unreleased/dz-patch-58.yml b/changelogs/unreleased/dz-patch-58.yml new file mode 100644 index 00000000000..97ceadd303d --- /dev/null +++ b/changelogs/unreleased/dz-patch-58.yml @@ -0,0 +1,5 @@ +--- +title: Replace Oxygen-Sans font with Noto Sans +merge_request: 28322 +author: +type: changed -- cgit v1.2.1