From 9548731e3ef012eba97f03fe9db762851eed7cb0 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sun, 2 Nov 2025 09:14:49 +0000 Subject: [PATCH] Adjust Markdown alert colors for 6.1-stable: use standard orange/yellow for "Warning" and "Caution" (#43425). git-svn-id: https://svn.redmine.org/redmine/branches/6.1-stable@24106 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/assets/stylesheets/application.css | 30 +++++++++---------- app/assets/stylesheets/wiki_syntax.css | 4 +-- .../stylesheets/wiki_syntax_detailed.css | 20 ++++++------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 9f953b93d..4d8f90c8a 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1315,25 +1315,25 @@ div.flash.warning svg.icon-svg, .conflict svg.icon-svg { font-weight: bold; } -.markdown-alert-tip { border-color: #5db651; } -.markdown-alert-tip .markdown-alert-title { color: #005f00; } -.markdown-alert-tip .markdown-alert-title svg {stroke: #005f00; } +.markdown-alert-tip { border-color: #37b24d; /* oc-green-7 */ } +.markdown-alert-tip .markdown-alert-title { color: #2b8a3e; /* oc-green-9 */ } +.markdown-alert-tip .markdown-alert-title svg {stroke: #2b8a3e; /* oc-green-9 */ } -.markdown-alert-important { border-color: #800080; } -.markdown-alert-important .markdown-alert-title { color: #4b006e; } -.markdown-alert-important .markdown-alert-title svg { stroke: #4b006e; } +.markdown-alert-important { border-color: #ae3ec9; /* oc-grape-7 */ } +.markdown-alert-important .markdown-alert-title { color: #862e9c; /* oc-grape-9 */ } +.markdown-alert-important .markdown-alert-title svg { stroke: #862e9c; /* oc-grape-9 */ } -.markdown-alert-caution { border-color: #c22; } -.markdown-alert-caution .markdown-alert-title { color: #880000; } -.markdown-alert-caution .markdown-alert-title svg { stroke: #880000; } +.markdown-alert-caution { border-color: #f59f00; /* oc-yellow-7 */} +.markdown-alert-caution .markdown-alert-title { color: #e67700; /* oc-yellow-9 */ } +.markdown-alert-caution .markdown-alert-title svg { stroke: #e67700; /* oc-yellow-9 */ } -.markdown-alert-warning { border-color: #e4bc4b; } -.markdown-alert-warning .markdown-alert-title { color: #a7760c; } -.markdown-alert-warning .markdown-alert-title svg { stroke: #a7760c; } +.markdown-alert-warning { border-color: #f76707; /* oc-orange-7 */ } +.markdown-alert-warning .markdown-alert-title { color: #d9480f; /* oc-orange-9 */ } +.markdown-alert-warning .markdown-alert-title svg { stroke: #d9480f; /* oc-orange-9 */ } -.markdown-alert-note { border-color: #169; } -.markdown-alert-note .markdown-alert-title { color: #1e40af; } -.markdown-alert-note .markdown-alert-title svg { stroke: #1e40af; } +.markdown-alert-note { border-color: #4263eb; /* oc-indigo-7 */ } +.markdown-alert-note .markdown-alert-title { color: #364fc7; /* oc-indigo-9 */ } +.markdown-alert-note .markdown-alert-title svg { stroke: #364fc7; /* oc-indigo-9 */ } /***** Ajax indicator ******/ #ajax-indicator { diff --git a/app/assets/stylesheets/wiki_syntax.css b/app/assets/stylesheets/wiki_syntax.css index 89b117419..8d5703a34 100644 --- a/app/assets/stylesheets/wiki_syntax.css +++ b/app/assets/stylesheets/wiki_syntax.css @@ -81,5 +81,5 @@ span.more_info { font-weight: normal; } .markdown-alert-title { font-weight: bold; } -.markdown-alert-note { border-color: #169; } -.markdown-alert-note .markdown-alert-title { color: #1e40af; } \ No newline at end of file +.markdown-alert-note { border-color: #4263eb; /* oc-indigo-7 */ } +.markdown-alert-note .markdown-alert-title { color: #364fc7; /* oc-indigo-9 */ } diff --git a/app/assets/stylesheets/wiki_syntax_detailed.css b/app/assets/stylesheets/wiki_syntax_detailed.css index ad3c8c65f..223cb0280 100644 --- a/app/assets/stylesheets/wiki_syntax_detailed.css +++ b/app/assets/stylesheets/wiki_syntax_detailed.css @@ -73,13 +73,13 @@ table.list td { background-color: #f5f5f5; vertical-align: middle; padding: 0.3e .markdown-alert-title { font-weight: bold; } -.markdown-alert-tip { border-color: #5db651; } -.markdown-alert-tip .markdown-alert-title { color: #005f00; } -.markdown-alert-important { border-color: #800080; } -.markdown-alert-important .markdown-alert-title { color: #4b006e; } -.markdown-alert-caution { border-color: #c22; } -.markdown-alert-caution .markdown-alert-title { color: #880000; } -.markdown-alert-warning { border-color: #e4bc4b; } -.markdown-alert-warning .markdown-alert-title { color: #a7760c; } -.markdown-alert-note { border-color: #169; } -.markdown-alert-note .markdown-alert-title { color: #1e40af; } \ No newline at end of file +.markdown-alert-tip { border-color: #37b24d; /* oc-green-7 */ } +.markdown-alert-tip .markdown-alert-title { color: #2b8a3e; /* oc-green-9 */ } +.markdown-alert-important { border-color: #ae3ec9 ; /* oc-grape-7 */ } +.markdown-alert-important .markdown-alert-title { color: #862e9c; /* oc-grape-9 */ } +.markdown-alert-caution { border-color: #f59f00; /* oc-yellow-7 */ } +.markdown-alert-caution .markdown-alert-title { color: #e67700; /* oc-yellow-9 */ } +.markdown-alert-warning { border-color: #f76707; /* oc-orange-7 */ } +.markdown-alert-warning .markdown-alert-title { color: #d9480f; /* oc-orange-9 */ } +.markdown-alert-note { border-color: #4263eb; /* oc-indigo-7 */ } +.markdown-alert-note .markdown-alert-title { color: #364fc7; /* oc-indigo-9 */ }