From 9f615d1df712e7e602e8a26af263e0dbc6efcd41 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Tue, 13 Jan 2026 07:56:18 +0000
Subject: [PATCH] Merged r24297 from trunk to 6.1-stable (#43664).

git-svn-id: https://svn.redmine.org/redmine/branches/6.1-stable@24308 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/assets/stylesheets/application.css | 16 ++++++++++++----
 app/assets/stylesheets/rtl.css         | 10 ----------
 app/views/common/_tabs.html.erb        |  4 ++--
 app/views/layouts/base.html.erb        |  8 ++++++--
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index c4e0d6e4f..f87545690 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -139,7 +139,7 @@ pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;}
 #main-menu .menu-children li a:hover {color: #fff; background-color: #759FCF;}
 
 #main-menu .tabs-buttons {
-  right: 6px;
+  inset-inline-end: 6px;
   background-color: transparent;
   border-bottom-color: transparent;
 }
@@ -1521,7 +1521,15 @@ p.progress-info {clear: left; font-size: 86%; margin-top:-4px; color:#777;}
 
 #content .tabs ul li a.selected:hover {background-color: #fff;}
 
-div.tabs-buttons { position:absolute; right: 0; width: 54px; height: 24px; background: white; bottom: 0; border-bottom: 1px solid #bbbbbb; }
+div.tabs-buttons {
+  position: absolute;
+  inset-inline-end: 0;
+  width: 54px;
+  height: 24px;
+  background: white;
+  bottom: 0;
+  border-bottom: 1px solid #bbbbbb;
+}
 
 button.tab-left, button.tab-right {
   font-size: 0.9em;
@@ -1546,7 +1554,7 @@ button.tab-left svg.icon-svg, button.tab-right svg.icon-svg {
 }
 
 button.tab-left {
-  right: 28px;
+  inset-inline-end: 28px;
   border-top-left-radius:3px;
 }
 button.tab-left:not(:has(svg)) {
@@ -1554,7 +1562,7 @@ button.tab-left:not(:has(svg)) {
 }
 
 button.tab-right {
-  right: 4px;
+  inset-inline-end: 4px;
   border-top-right-radius:3px;
 }
 button.tab-right:not(:has(svg)) {
diff --git a/app/assets/stylesheets/rtl.css b/app/assets/stylesheets/rtl.css
index 50919379b..86a87fd50 100644
--- a/app/assets/stylesheets/rtl.css
+++ b/app/assets/stylesheets/rtl.css
@@ -299,16 +299,6 @@ p.progress-info {clear:right;}
   margin-right:0px; margin-left:4px;
 }
 
-div.tabs-buttons {right:auto; left:0;}
-
-button.tab-left {
-  right:auto; left:20px;
-}
-
-button.tab-right {
-  right:auto; left:20px;
-}
-
 /***** Diff *****/
 
 /***** Wiki *****/
diff --git a/app/views/common/_tabs.html.erb b/app/views/common/_tabs.html.erb
index 0190e5e6b..3f3dd278e 100644
--- a/app/views/common/_tabs.html.erb
+++ b/app/views/common/_tabs.html.erb
@@ -13,10 +13,10 @@
   </ul>
   <div class="tabs-buttons" style="display:none;">
     <button class="tab-left icon-only" type="button" onclick="moveTabLeft(this);">
-      <%= sprite_icon "angle-left" %>
+      <%= sprite_icon("angle-left", rtl: true) %>
     </button>
     <button class="tab-right icon-only" type="button" onclick="moveTabRight(this);">
-      <%= sprite_icon "angle-right" %>
+      <%= sprite_icon("angle-right", rtl: true) %>
     </button>
   </div>
 </div>
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index ad0229653..870d83477 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -93,8 +93,12 @@
     <div id="main-menu" class="tabs">
         <%= render_main_menu(@project) %>
         <div class="tabs-buttons" style="display:none;">
-            <button class="tab-left" onclick="moveTabLeft(this); return false;"></button>
-            <button class="tab-right" onclick="moveTabRight(this); return false;"></button>
+            <button class="tab-left icon-only" onclick="moveTabLeft(this); return false;">
+              <%= sprite_icon("angle-left", rtl: true) %>
+            </button>
+            <button class="tab-right icon-only" onclick="moveTabRight(this); return false;">
+              <%= sprite_icon("angle-right", rtl: true) %>
+            </button>
         </div>
     </div>
     <% end %>