# HG changeset patch # User Marcin Kuzminski # Date 2018-10-26 13:26:12 # Node ID 073194878474f207fb770afe0fe7d8b8ded29bb8 # Parent 9a2c9ca9a27cb1a332676b89d2d2799214182fe5 fonts: use consistent fonts across whole application. diff --git a/rhodecode/public/css/bootstrap-variables.less b/rhodecode/public/css/bootstrap-variables.less --- a/rhodecode/public/css/bootstrap-variables.less +++ b/rhodecode/public/css/bootstrap-variables.less @@ -44,8 +44,6 @@ @font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif; @font-family-serif: Georgia, "Times New Roman", Times, serif; -//** Default monospace fonts for ``, ``, and `
`.
-@font-family-monospace:   Consolas, "Liberation Mono", Menlo, Monaco, Courier, monospace;
 
 @font-family-base:        @font-family-sans-serif;
 
diff --git a/rhodecode/public/css/code-block.less b/rhodecode/public/css/code-block.less
--- a/rhodecode/public/css/code-block.less
+++ b/rhodecode/public/css/code-block.less
@@ -543,7 +543,7 @@ div.search-code-body {
             border-right: 1px solid #ccc !important;
             padding-right: 10px;
             text-align: right;
-            font-family: "Lucida Console",Monaco,monospace;
+            font-family: @text-monospace;
             span {
                 white-space: pre-wrap;
                 color: #666666;
@@ -1066,7 +1066,7 @@ table.cb {
         }
 
         &.cb-hunk {
-            font-family: @font-family-monospace;
+            font-family: @text-monospace;
             color: rgba(0, 0, 0, 0.3);
 
             td {
@@ -1098,7 +1098,7 @@ table.cb {
                 padding-right: @cb-line-code-padding;
                 display: block;
                 white-space: pre-wrap;
-                font-family: @font-family-monospace;
+                font-family: @text-monospace;
                 word-break: break-all;
                 .nonl {
                     color: @color5;
@@ -1143,7 +1143,7 @@ table.cb {
         &.cb-data {
             text-align: right;
             width: 30px;
-            font-family: @font-family-monospace;
+            font-family: @text-monospace;
 
             .icon-comment {
                 cursor: pointer;
@@ -1165,7 +1165,7 @@ table.cb {
             color: rgba(0, 0, 0, 0.3);
             text-align: right;
             border-right: 1px solid #eee;
-            font-family: @font-family-monospace;
+            font-family: @text-monospace;
             -webkit-user-select: none;
             -moz-user-select: none;
             user-select: none;
diff --git a/rhodecode/public/css/comments.less b/rhodecode/public/css/comments.less
--- a/rhodecode/public/css/comments.less
+++ b/rhodecode/public/css/comments.less
@@ -336,7 +336,7 @@ div.comment-form {
 .comment-form textarea {
     width: 100%;
     height: 100px;
-    font-family: 'Monaco', 'Courier', 'Courier New', monospace;
+    font-family: @text-monospace;
 }
 
 form.comment-form {
diff --git a/rhodecode/public/css/legacy_code_styles.less b/rhodecode/public/css/legacy_code_styles.less
--- a/rhodecode/public/css/legacy_code_styles.less
+++ b/rhodecode/public/css/legacy_code_styles.less
@@ -180,7 +180,7 @@ div.markdown-block table {
     margin: 3px 0px 13px 0px !important;
     color: #424242 !important;
     font-size: 13px !important;
-    font-family: "Helvetica" !important;
+    font-family: @text-regular;
     font-weight: normal  !important;
     overflow: visible !important;
     line-height: 140% !important;
@@ -256,7 +256,7 @@ div.markdown-block code,
 div.markdown-block pre,
 div.markdown-block #ws,
 div.markdown-block #message {
-    font-family: Monaco;
+    font-family: @text-monospace;
     font-size: 11px;
     .border-radius(@border-radius);
     background-color: white;
diff --git a/rhodecode/public/css/main-content.less b/rhodecode/public/css/main-content.less
--- a/rhodecode/public/css/main-content.less
+++ b/rhodecode/public/css/main-content.less
@@ -91,7 +91,7 @@
 }
 
 .input-monospace {
-    font-family: @font-family-monospace;
+    font-family: @text-monospace;
 }
 
 .fields {
diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less
--- a/rhodecode/public/css/main.less
+++ b/rhodecode/public/css/main.less
@@ -2430,7 +2430,7 @@ div.markup-form {
 .markup-form textarea {
     width: 100%;
     height: 100px;
-    font-family: 'Monaco', 'Courier', 'Courier New', monospace;
+    font-family: @text-monospace;
 }
 
 form.markup-form {
diff --git a/rhodecode/public/css/readme-box.less b/rhodecode/public/css/readme-box.less
--- a/rhodecode/public/css/readme-box.less
+++ b/rhodecode/public/css/readme-box.less
@@ -71,7 +71,7 @@ div.readme_box table {
     margin: 3px 0px 13px 0px !important;
     color: #424242 !important;
     font-size: 13px !important;
-    font-family: "Helvetica" !important;
+    font-family: @text-regular;
     font-weight: normal  !important;
     overflow: visible !important;
     line-height: 140% !important;
@@ -136,7 +136,7 @@ div.readme_box button {
 
 div.readme_box code,
 div.readme_box pre {
-    font-family: Monaco;
+    font-family: @text-monospace;
     font-size: 11px;
     .border-radius(@border-radius);
     background-color: white;
diff --git a/rhodecode/public/css/variables.less b/rhodecode/public/css/variables.less
--- a/rhodecode/public/css/variables.less
+++ b/rhodecode/public/css/variables.less
@@ -54,11 +54,14 @@
 @repo-title-fontsize: 18px;
 
 @text-regular: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+@text-monospace: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;
+
 @text-italic: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
 @text-bold: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
 @text-semibold: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
 @text-bold-italic: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
 @text-code: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;
+
 @text-light: @text-regular;
 @text-light-italic: @text-italic;
 // Used for .close buttons