From 9a90ee3a38f7cf8ab7f06bf0062424d093560a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Thu, 2 Aug 2018 14:18:20 +0200 Subject: [PATCH] Revert "Switch default fixed font from NotoMono to NotoSansMono" This reverts commit b2acee1cb986b696adfad7daabfe9279949a3e54. Reason: NotoSansMono is not per se a fixed font. --- docs/interface_guidelines/haiku.css | 2 +- src/kits/network/libnetapi/GopherRequest.cpp | 2 +- src/servers/app/ServerConfig.h | 2 +- src/servers/app/font/FontManager.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/interface_guidelines/haiku.css b/docs/interface_guidelines/haiku.css index ed5c6a99a7..cdd108d91d 100644 --- a/docs/interface_guidelines/haiku.css +++ b/docs/interface_guidelines/haiku.css @@ -12,7 +12,7 @@ } cmdsynopsis, code, command, computeroutput, envar, filename, keycode, keysym, literal, option, parameter, sgmltag, systemitem { - font-family: "Noto Sans Mono", Courier, "Courier New", monospace, fixed; + font-family: "Noto Mono", Courier, "Courier New", monospace, fixed; } term { font-weight: bold; diff --git a/src/kits/network/libnetapi/GopherRequest.cpp b/src/kits/network/libnetapi/GopherRequest.cpp index 16122279bd..8b4bf68555 100644 --- a/src/kits/network/libnetapi/GopherRequest.cpp +++ b/src/kits/network/libnetapi/GopherRequest.cpp @@ -143,7 +143,7 @@ static const char *kStyleSheet = "\n" "body#gopher span {\n" " margin-left: 1em;\n" " padding-left: 2em;\n" -" font-family: 'Noto Sans Mono', Courier, monospace;\n" +" font-family: 'Noto Mono', Courier, monospace;\n" " word-wrap: break-word;\n" " white-space: pre-wrap; }\n" "\n" diff --git a/src/servers/app/ServerConfig.h b/src/servers/app/ServerConfig.h index 51427c55dd..6416516848 100644 --- a/src/servers/app/ServerConfig.h +++ b/src/servers/app/ServerConfig.h @@ -35,7 +35,7 @@ #define FALLBACK_BOLD_FONT_FAMILY "Swis721 BT" #define DEFAULT_BOLD_FONT_STYLE "Bold" #define DEFAULT_BOLD_FONT_SIZE 12.0f -#define DEFAULT_FIXED_FONT_FAMILY "Noto Sans Mono" +#define DEFAULT_FIXED_FONT_FAMILY "Noto Mono" #define FALLBACK_FIXED_FONT_FAMILY "Courier10 BT" #define DEFAULT_FIXED_FONT_STYLE "Regular" #define DEFAULT_FIXED_FONT_SIZE 12.0f diff --git a/src/servers/app/font/FontManager.cpp b/src/servers/app/font/FontManager.cpp index e6dc920bb8..088b23f81c 100644 --- a/src/servers/app/font/FontManager.cpp +++ b/src/servers/app/font/FontManager.cpp @@ -342,8 +342,8 @@ FontManager::_LoadRecentFontMappings() _AddDefaultMapping("Noto Sans", "Bold", veraFontPath.Path()); veraFontPath.SetTo(ttfontsPath.Path()); - veraFontPath.Append("NotoSansMono-Regular.ttf"); - _AddDefaultMapping("Noto Sans Mono", "Regular", veraFontPath.Path()); + veraFontPath.Append("NotoMono-Regular.ttf"); + _AddDefaultMapping("Noto Mono", "Regular", veraFontPath.Path()); return true; }