From 50f79c0bd992cdbd20649f44592338d93ea401c9 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 11 Jun 2024 00:05:00 +0300 Subject: [PATCH 1/2] Fix loader in rtl mode --- apps/documenteditor/main/index.html | 5 ++++- apps/documenteditor/main/index.html.deploy | 5 ++++- apps/presentationeditor/main/index.html | 5 ++++- apps/presentationeditor/main/index.html.deploy | 5 ++++- apps/spreadsheeteditor/main/index.html | 5 ++++- apps/spreadsheeteditor/main/index.html.deploy | 5 ++++- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 4728c7925e..6ffa87f453 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -333,7 +333,10 @@ document.querySelectorAll('.compact').forEach(function(item){ item.style.display = 'inline-block'; }); - document.querySelector('.fat').style.left = '655px'; + if (document.body.classList.contains('rtl')) + document.querySelector('.fat').style.right = '592px'; + else + document.querySelector('.fat').style.left = '592px'; } visible && (document.querySelector('.brendpanel').style.display = 'block'); diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index ac13410291..3bf14cebbe 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -296,7 +296,10 @@ document.querySelectorAll('.compact').forEach(function(item){ item.style.display = 'inline-block'; }); - document.querySelector('.fat').style.left = '655px'; + if (document.body.classList.contains('rtl')) + document.querySelector('.fat').style.right = '592px'; + else + document.querySelector('.fat').style.left = '592px'; } visible && (document.querySelector('.brendpanel').style.display = 'block'); diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index 6ac3aa5c2c..ddf2dcc0c4 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -330,7 +330,10 @@ document.querySelectorAll('.compact').forEach(function(item){ item.style.display = 'inline-block'; }); - document.querySelector('.fat').style.left = '868px'; + if (document.body.classList.contains('rtl')) + document.querySelector('.fat').style.right = '865px'; + else + document.querySelector('.fat').style.left = '865px'; } visible && (document.querySelector('.brendpanel').style.display = 'block'); diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy index 3a98e6d824..46fa96a28a 100644 --- a/apps/presentationeditor/main/index.html.deploy +++ b/apps/presentationeditor/main/index.html.deploy @@ -323,7 +323,10 @@ document.querySelectorAll('.compact').forEach(function(item){ item.style.display = 'inline-block'; }); - document.querySelector('.fat').style.left = '868px'; + if (document.body.classList.contains('rtl')) + document.querySelector('.fat').style.right = '865px'; + else + document.querySelector('.fat').style.left = '865px'; } visible && (document.querySelector('.brendpanel').style.display = 'block'); diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index 3f357cb925..1167ddb7b3 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -353,7 +353,10 @@ document.querySelectorAll('.compact').forEach(function(item){ item.style.display = 'inline-block'; }); - document.querySelector('.fat').style.left = '923px'; + if (document.body.classList.contains('rtl')) + document.querySelector('.fat').style.right = '923px'; + else + document.querySelector('.fat').style.left = '923px'; } visible && (document.querySelector('.brendpanel').style.display = 'block'); diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index 314405e460..73b2798757 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -339,7 +339,10 @@ document.querySelectorAll('.compact').forEach(function(item){ item.style.display = 'inline-block'; }); - document.querySelector('.fat').style.left = '923px'; + if (document.body.classList.contains('rtl')) + document.querySelector('.fat').style.right = '923px'; + else + document.querySelector('.fat').style.left = '923px'; } visible && (document.querySelector('.brendpanel').style.display = 'block'); From 9b54119cbc321e1369183d08af7890b36a8b54a6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 11 Jun 2024 00:10:11 +0300 Subject: [PATCH 2/2] Fix separator style --- apps/common/main/resources/less/toolbar.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index b3edb679d7..ce1dd1db9a 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -381,6 +381,9 @@ &.invisible { margin-left: 0; border: none; + .rtl & { + margin-right: 0; + } } &.long {