SONAR-14207 Add Ubuntu Mono as a font for the source code viewer

diff --git a/server/sonar-web/src/main/js/app/styles/init/base.css b/server/sonar-web/src/main/js/app/styles/init/base.css
index c46e372bdda57a4bfe297674e3c087c72089ef40..30a7838c64c9910edfe311a8fccb96d7754a56c2 100644 (file)
--- a/server/sonar-web/src/main/js/app/styles/init/base.css
+++ b/server/sonar-web/src/main/js/app/styles/init/base.css
@@ -102,7 +102,7 @@ code,
 kbd,
 samp,
 tt {
-  font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
+  font-family: var(--sourceCodeFontFamily);
   font-size: var(--smallFontSize);
   line-height: 18px;
 }

diff --git a/server/sonar-web/src/main/js/app/styles/init/forms.css b/server/sonar-web/src/main/js/app/styles/init/forms.css
index 75c9ee6bd696a1da97a5571ffa3002c44540b302..188d3d1b0fbb2eae7b0bd30445c466fef4f76fae 100644 (file)
--- a/server/sonar-web/src/main/js/app/styles/init/forms.css
+++ b/server/sonar-web/src/main/js/app/styles/init/forms.css
@@ -180,7 +180,7 @@ select {
 }
 
 .input-code {
-  font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
+  font-family: var(--sourceCodeFontFamily);
   font-size: var(--smallFontSize);
 }
 

diff --git a/server/sonar-web/src/main/js/app/styles/init/type.css b/server/sonar-web/src/main/js/app/styles/init/type.css
index 843b7e76c7ddbcd7c33b7374c734561347393ea2..b03a9fcd4df5d260ba9ef999f230e896b0fbe419 100644 (file)
--- a/server/sonar-web/src/main/js/app/styles/init/type.css
+++ b/server/sonar-web/src/main/js/app/styles/init/type.css
@@ -295,6 +295,6 @@ small,
 
 .monospaced {
   line-height: 18px;
-  font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
+  font-family: var(--sourceCodeFontFamily);
   font-size: var(--smallFontSize);
 }

diff --git a/server/sonar-web/src/main/js/app/styles/style.css b/server/sonar-web/src/main/js/app/styles/style.css
index 3ce76afe13a03e953579e06f96aa53d3e8088436..fe11bc458911ea756a5974dc5bd4950f2886cc41 100644 (file)
--- a/server/sonar-web/src/main/js/app/styles/style.css
+++ b/server/sonar-web/src/main/js/app/styles/style.css
@@ -122,7 +122,7 @@
 .markdown pre,
 .rule-desc code,
 .markdown code {
-  font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
+  font-family: var(--sourceCodeFontFamily);
   font-size: var(--smallFontSize);
 }
 
@@ -211,7 +211,7 @@ code.rule {
   border: 1px dashed #aaa;
   box-sizing: border-box;
   font-size: var(--smallFontSize);
-  font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
+  font-family: var(--sourceCodeFontFamily);
 }
 
 .property blockquote,

diff --git a/server/sonar-web/src/main/js/app/theme.js b/server/sonar-web/src/main/js/app/theme.js
index 431e5654be6e22c031317ed85731f56b951f38a4..2485185bba57a72a0d2a1688e5318b30b14dfe8d 100644 (file)
--- a/server/sonar-web/src/main/js/app/theme.js
+++ b/server/sonar-web/src/main/js/app/theme.js
@@ -176,8 +176,7 @@ module.exports = {
   fonts: {
     baseFontFamily: "'Helvetica Neue', Helvetica, Arial, sans-serif",
     systemFontFamily: "-apple-system,'BlinkMacSystemFont','Helvetica','Arial',sans-serif",
-    sonarcloudFontFamily:
-      "Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif"
+    sourceCodeFontFamily: "Consolas, 'Ubuntu Mono', 'Liberation Mono', Menlo, Courier, monospace"
   },
 
   // z-index

diff --git a/server/sonar-web/src/main/js/apps/coding-rules/styles.css b/server/sonar-web/src/main/js/apps/coding-rules/styles.css
index 1e1d6ccdc909f0210c9bf4fc0f10618b59f676e7..1f1d153550260e6ff2d7d02946380223fbd8fe7e 100644 (file)
--- a/server/sonar-web/src/main/js/apps/coding-rules/styles.css
+++ b/server/sonar-web/src/main/js/apps/coding-rules/styles.css
@@ -59,7 +59,7 @@
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
+  font-family: var(--sourceCodeFontFamily);
 }
 
 .coding-rules-detail-quality-profile-parameter + .coding-rules-detail-quality-profile-parameter {
@@ -135,7 +135,7 @@
 }
 
 .coding-rules-detail-parameter-value {
-  font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
+  font-family: var(--sourceCodeFontFamily);
   word-break: break-all;
 }
 

diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/Line.css b/server/sonar-web/src/main/js/components/SourceViewer/components/Line.css
index 43615d8adeeabb37538fd93cf1c7c588d181c106..311e044f4e6f2caa1dc849a5e33e90720dfa2b70 100644 (file)
--- a/server/sonar-web/src/main/js/components/SourceViewer/components/Line.css
+++ b/server/sonar-web/src/main/js/components/SourceViewer/components/Line.css
@@ -87,7 +87,7 @@
 .source-line-number,
 .source-line-scm {
   line-height: 18px;
-  font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
+  font-family: var(--sourceCodeFontFamily);
   font-size: var(--smallFontSize);
 }