From c5c4a90f6c0f4e8ece0949f6c578f4160d82ff19 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Sat, 3 Jan 2026 07:41:57 +0000
Subject: [PATCH] Integrate header RTL styles from rtl.css into application.css
 using logical properties (#43515).

git-svn-id: https://svn.redmine.org/redmine/trunk@24251 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/assets/stylesheets/application.css | 20 +++++++++++---------
 app/assets/stylesheets/rtl.css         | 11 -----------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 2872a35be..0e9d90c2e 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -72,39 +72,41 @@ pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;}
   background: #3E5B76; /* no match in Open Color, using hex code */
   color: var(--oc-white);
   font-size: 0.8em;
-  padding: 2px 10px 2px 12px;
+  padding-block: 2px;
+  padding-inline: 12px 10px;
 }
 #top-menu ul {margin: 0;  padding: 0;}
 #top-menu li {
-  float:left;
+  float:inline-start;
   list-style-type:none;
   margin: 0px 0px 0px 0px;
   padding: 0px 0px 0px 0px;
   white-space:nowrap;
 }
-#top-menu a {color: var(--oc-white); margin-right: 8px; font-weight: bold;}
-#top-menu #loggedas { float: right; margin-right: 0.5em; color: var(--oc-white); }
+#top-menu a {color: var(--oc-white); margin-inline-end: 8px; font-weight: bold;}
+#top-menu #loggedas { float: inline-end; margin-inline-end: 0.5em; color: var(--oc-white); }
 
-#account {float:right;}
+#account {float:inline-end;}
 
 #header {
   min-height: 8.7ex;
   margin: 0;
   background: linear-gradient(180deg, #628DB6 30%, #356D92); /* no match in Open Color, using hex code */
   color: var(--oc-gray-0);
-  padding: 4px 16px 20px 16px;
+  padding-block: 4px 20px;
+  padding-inline: 16px;
   position: relative;
 }
 #header a {color: var(--oc-gray-0);}
 #header h1 { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 1.4375rem; font-weight: normal;}
 #header h1 .breadcrumbs { display:block; font-size: 0.8rem; font-weight: normal; line-height: 100%;}
 
-#quick-search {float:right;}
+#quick-search {float:inline-end;}
 #quick-search #q {width:130px; height:24px; box-sizing:border-box; vertical-align:middle; border:1px solid var(--oc-gray-4); border-radius:3px;}
-#quick-search form {float:left; margin-right:3px;}
+#quick-search form {float:inline-start; margin-inline-end:3px;}
 #quick-search form input {margin-top:0; margin-bottom:0;}
 #quick-search form label {vertical-align:middle;}
-#quick-search #project-jump {float:left;}
+#quick-search #project-jump {float:inline-start;}
 
 #main-menu {position: absolute;  bottom: 0px;  left: 10px; margin-right: -500px; width: 100%;}
 #main-menu ul {margin: 0;  padding: 0; width: 100%; white-space: nowrap;}
diff --git a/app/assets/stylesheets/rtl.css b/app/assets/stylesheets/rtl.css
index c83094f7d..efa155ae9 100644
--- a/app/assets/stylesheets/rtl.css
+++ b/app/assets/stylesheets/rtl.css
@@ -6,17 +6,6 @@
 
 h1, h2, h3, h4 {padding:2px 00px 1px 10px;}
 /***** Layout *****/
-#top-menu {padding:2px 6px 0px 2px;}
-#top-menu li {float:right;}
-#top-menu a {margin-right:0;margin-left:8px;}
-#top-menu #loggedas {float:left;margin-right:0;margin-left:0.5em;}
-
-#account {float:left;}
-
-#header {padding:4px 6px 20px 8px;}
-
-#quick-search {float:left;}
-
 #main-menu {left:auto;right:6px;margin-right:0;margin-left:-500px;}
 #main-menu li {float:right;margin:0px 0px 0px 2px;}