From fceb7ce17588f6db1a1ee0f090e85049832da479 Mon Sep 17 00:00:00 2001 From: MAEDA Go Date: Wed, 21 Oct 2026 07:23:30 +0900 Subject: [PATCH] Define the monospace font stack as a CSS variable and drop Courier --- app/assets/stylesheets/application.css | 7 ++++--- app/assets/stylesheets/scm.css | 4 ++-- app/assets/stylesheets/wiki_syntax.css | 3 ++- app/assets/stylesheets/wiki_syntax_detailed.css | 3 ++- app/views/layouts/mailer.html.erb | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index af8700ce9..e60c89468 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -40,6 +40,7 @@ :root { --fonts-main: "Noto Sans", sans-serif; + --fonts-monospace: Consolas, Menlo, "Liberation Mono", monospace; --color-current-marker: var(--oc-indigo-5); /* no match in Open Color, using hex codes */ --color-top-menu-background: #234761; @@ -72,7 +73,7 @@ h1, h2, h3, h4, h5, h6 { h2 {font-size: 1.25rem;} h3 {font-size: 1.0625rem;} h4 {font-size: 0.875rem; border-block-end: 1px solid var(--oc-gray-4); font-weight: normal;} -pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;} +pre, code {font-family: var(--fonts-monospace);} .wiki h1 {font-size: 1.6em;} .wiki h2 {font-size: 1.4em;} .wiki h3 {font-size: 1.2em;} @@ -903,7 +904,7 @@ blockquote { font-style: italic; border-inline-start: 3px solid var(--oc-gray-3) blockquote blockquote { margin-inline-start: 0;} abbr[title], span.field-description[title] { text-decoration: none; border-block-end: 1px dotted var(--oc-gray-5); cursor: help; } textarea.wiki-edit {inline-size: 99%; resize: vertical; box-sizing: border-box;} -body.textarea-monospace textarea.wiki-edit {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;} +body.textarea-monospace textarea.wiki-edit {font-family: var(--fonts-monospace);} body.textarea-proportional textarea.wiki-edit {font-family: var(--fonts-main);} li p {margin-block-start: 0;} div.issue { @@ -2401,7 +2402,7 @@ h2 img { vertical-align:middle; } border:1px solid var(--oc-gray-4); padding-block: 2px; padding-inline: 4px; - font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; + font-family: var(--fonts-monospace); } .sample-data tr:first-child td {font-weight:bold; text-align:center;} diff --git a/app/assets/stylesheets/scm.css b/app/assets/stylesheets/scm.css index bb72a505f..ebc63afe4 100644 --- a/app/assets/stylesheets/scm.css +++ b/app/assets/stylesheets/scm.css @@ -58,7 +58,7 @@ li.change .copied-from:before { content: " - "} [dir="rtl"] #changes-legend li { background-position: right 5px top 1px; } table.filecontent { border: 1px solid var(--oc-gray-4); border-collapse: collapse; inline-size: 98%; background-color: var(--oc-gray-0); } -table.filecontent tbody {font-family:Consolas, Menlo, "Liberation Mono", Courier, monospace; font-size:0.75rem;} +table.filecontent tbody {font-family:var(--fonts-monospace); font-size:0.75rem;} table.filecontent th { border: 1px solid var(--oc-gray-4); background-color: var(--oc-gray-1); } table.filecontent th.filename { background-color: var(--oc-gray-2); text-align: start; padding: 5px;} table.filecontent tr.spacing th { text-align:center; } @@ -94,7 +94,7 @@ table.filecontent td.line-code { table.filecontent td.line-code pre, table.filecontent td.line-code div { margin: 0px; white-space: pre-wrap; - font-family:Consolas, Menlo, "Liberation Mono", Courier, monospace; font-size:0.75rem; + font-family:var(--fonts-monospace); font-size:0.75rem; } table.filecontent tr:target th.line-num { background-color:var(--oc-gray-3); color: var(--oc-gray-6); } diff --git a/app/assets/stylesheets/wiki_syntax.css b/app/assets/stylesheets/wiki_syntax.css index 1cad8ff6e..9699f4dc6 100644 --- a/app/assets/stylesheets/wiki_syntax.css +++ b/app/assets/stylesheets/wiki_syntax.css @@ -34,11 +34,12 @@ :root { --fonts-main: "Noto Sans", sans-serif; + --fonts-monospace: Consolas, Menlo, "Liberation Mono", monospace; } h1 { font-family: var(--fonts-main); font-size: 0.875rem; text-align: center; color: var(--oc-gray-8); } body { font-family: var(--fonts-main); font-size: 0.75rem; color: var(--oc-gray-8); } -pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; } +pre, code { font-family: var(--fonts-monospace); } table th { padding-block-start: 1em; } table th img { border: 1px solid var(--oc-gray-5); diff --git a/app/assets/stylesheets/wiki_syntax_detailed.css b/app/assets/stylesheets/wiki_syntax_detailed.css index fdecdb5d3..b286c68cf 100644 --- a/app/assets/stylesheets/wiki_syntax_detailed.css +++ b/app/assets/stylesheets/wiki_syntax_detailed.css @@ -34,10 +34,11 @@ :root { --fonts-main: "Noto Sans", sans-serif; + --fonts-monospace: Consolas, Menlo, "Liberation Mono", monospace; } body { font-family: var(--fonts-main); font-size: 0.875rem; color: var(--oc-gray-9); line-height: 1.6;} -pre, code { font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; } +pre, code { font-family: var(--fonts-monospace); } pre { margin-block: 1em; margin-inline: 1.6em 1em; diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index c8e59d74f..6dc51d66a 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -49,7 +49,7 @@ blockquote { margin-left: 0; } blockquote blockquote { margin-left: 0;} -pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;} +pre, code {font-family: Consolas, Menlo, "Liberation Mono", monospace;} pre { margin: 1em 1em 1em 1.6em; padding: 8px; -- 2.55.0