diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-05-17 12:10:06 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-05-17 12:10:06 +0000 |
| commit | 22d79d51c824e02c561e03467fb4cb5acb273e14 (patch) | |
| tree | 1ffcb979133d2c4414138555e48ef915b80ee044 | |
| parent | 30a60ee4a0373b184bc1a825bf332ee357d5f899 (diff) | |
| parent | d939aaf46f0ba45e6bc3fa7cc773a3b24ed7ad83 (diff) | |
| download | gitlab-ce-22d79d51c824e02c561e03467fb4cb5acb273e14.tar.gz | |
Merge branch 'dz-patch-58' into 'master'
Replace deprecated Oxygen-Sans font with Noto Sans
See merge request gitlab-org/gitlab-ce!28322
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/dz-patch-58.yml | 5 |
2 files changed, 6 insertions, 1 deletions
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 |