From cf3a3969614963a6ba3f67c922d08722e3874196 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Wed, 7 Jan 2026 09:06:52 +0000 Subject: [PATCH] Integrate `#activity` and `#search-results` RTL styles from rtl.css into application.css using logical properties (#43515). git-svn-id: https://svn.redmine.org/redmine/trunk@24285 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/assets/stylesheets/application.css | 41 +++++++++++++++++++------- app/assets/stylesheets/rtl.css | 15 ---------- 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 14d462702..ca1245d74 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -813,16 +813,24 @@ fieldset#date-range p { margin: 2px 0 2px 0; } scroll-margin-top: 50px; } -div#activity dl, #search-results { margin-left: 2em; } -div#activity dd, #search-results dd { margin-bottom: 1em; padding-left: 22px; font-size: 0.8125rem;} -div#activity dt svg.icon-svg {margin-right: 4px;} +div#activity dl, #search-results { margin-inline-start: 2em; } +div#activity dd, #search-results dd { + margin-bottom: 1em; + padding-inline-start: 22px; + font-size: 0.8125rem; +} +div#activity dt svg.icon-svg {margin-inline-end: 4px;} div#activity dt.me .time { border-bottom: 1px solid var(--oc-gray-6); } -div#activity dt .time { color: var(--oc-gray-7); font-size: 0.8125rem; margin-right: 4px; } +div#activity dt .time { + color: var(--oc-gray-7); + font-size: 0.8125rem; + margin-inline-end: 4px; +} div#activity dd .description, #search-results dd .description { font-style: italic; margin: 2px 0;} div#activity span.project:after, #search-results span.project:after { content: " - "; white-space: pre;} div#activity dd span.description, #search-results dd span.description { display:block; color: var(--oc-gray-6); } -div#activity dt.grouped {padding-left:5em;} -div#activity dd.grouped {margin-left:9em;} +div#activity dt.grouped {padding-inline-start:5em;} +div#activity dd.grouped {margin-inline-start:9em;} div#activity h3 { padding: 5px; background-color: var(--oc-gray-1); @@ -843,11 +851,19 @@ div#activity dl dt:first-child { max-width: 100%; } -#search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px; } +#search-results dd { + margin-bottom: 1em; + padding-inline-start: 20px; + margin-inline-start: 0; +} -div#search-results-counts {float:right;} +div#search-results-counts {float: inline-end;} div#search-results-counts ul { margin-top: 0.5em; } -div#search-results-counts li { list-style-type:none; float: left; margin-left: 1em; } +div#search-results-counts li { + list-style-type: none; + float: inline-start; + margin-inline-start: 1em; +} div#roadmap .related-issues { margin-bottom: 1em; } div#roadmap .related-issues td.checkbox { display: none; } @@ -1972,9 +1988,12 @@ h2 .avatar, h3 .avatar {margin-right: 4px;} h4 img.gravatar {margin: -2px 4px -4px 0;} /*# TODO: check where this rule is still used*/ td.username img.gravatar {margin: 0 0.5em 0 0; vertical-align: top;} -#activity dt .avatar {margin: 0 1em 0 0;} +#activity dt .avatar { + margin-block: 0; + margin-inline: 0 1em; +} -#activity dt, .journal {clear: left;} +#activity dt, .journal {clear: inline-start;} h2 img { vertical-align:middle; } diff --git a/app/assets/stylesheets/rtl.css b/app/assets/stylesheets/rtl.css index b5fc0031b..f9ca43072 100644 --- a/app/assets/stylesheets/rtl.css +++ b/app/assets/stylesheets/rtl.css @@ -100,18 +100,6 @@ div#issue-changesets {float:left; margin-left:0em; margin-right:1em; padding-le div.journal.private-notes {border-left:0px solid var(--oc-red-8); padding-left:0px; margin-left:0px; border-right:2px solid var(--oc-red-8); padding-right:4px; margin-right:-6px;} -div#activity dl, #search-results {margin-left:0em; margin-right:2em;} -div#activity dd, #search-results dd {padding-left:0px; padding-right:18px;} -div#activity dt, #search-results dt {padding-left:0px; padding-right:20px; background-position:right 50%;} - -div#activity dt.grouped {margin-left:0em; margin-right:5em;} -div#activity dd.grouped {margin-left:0em; margin-right:9em;} - -#search-results dd {padding-left:0px; margin-left:0px; padding-right:20px; margin-right:0px; } - -div#search-results-counts {float:left;} -div#search-results-counts li {float:right; margin-left:0em; margin-right:1em; } - div#version-summary { float:left; margin-left:0px; margin-right:16px;} div#version-summary th, div#version-summary td.total-hours { text-align:left;} @@ -274,12 +262,9 @@ h2 img.gravatar {margin: -2px 0 -4px 4px;} h3 img.gravatar {margin: -4px 0 -4px 4px;} h4 img.gravatar {margin: -6px 0 -4px 4px;} td.username img.gravatar {margin:0 0 0 0.5em; } -#activity dt img.gravatar {float:right; margin:0 0 1em 1em;} /* Used on 12px Gravatar img tags without the icon background */ .icon-gravatar {float:right; margin-right:px; margin-left:4px;} -#activity dt, .journal {clear:right;} - .journal-link {float:left;} /* Custom JQuery styles */