From 80c658bed5c05d556eda0511371062dea8b0ca71 Mon Sep 17 00:00:00 2001
From: Konstantin Kireyev <konstantin.kireyev@onlyoffice.com>
Date: Thu, 3 Oct 2024 19:39:19 +0500
Subject: [PATCH 1/2] fix bug 70677

---
 apps/common/main/lib/mods/perfect-scrollbar.js |  4 ++--
 apps/common/main/resources/less/scroller.less  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/common/main/lib/mods/perfect-scrollbar.js b/apps/common/main/lib/mods/perfect-scrollbar.js
index 4fe6612dde..417a91dde4 100644
--- a/apps/common/main/lib/mods/perfect-scrollbar.js
+++ b/apps/common/main/lib/mods/perfect-scrollbar.js
@@ -84,8 +84,8 @@
 
       var $scrollbarXRail = $("<div class='ps-scrollbar-x-rail'></div>").appendTo($this),
           $scrollbarYRail = $("<div class='ps-scrollbar-y-rail'></div>").appendTo($this),
-          $scrollbarX = $("<div class='ps-scrollbar-x'><span></span></div>").appendTo($scrollbarXRail),
-          $scrollbarY = $("<div class='ps-scrollbar-y'><span></span></div>").appendTo($scrollbarYRail),
+          $scrollbarX = $("<div class='ps-scrollbar-x'><div></div></div>").appendTo($scrollbarXRail),
+          $scrollbarY = $("<div class='ps-scrollbar-y'><div></div></div>").appendTo($scrollbarYRail),
           scrollbarXActive,
           scrollbarYActive,
           containerWidth,
diff --git a/apps/common/main/resources/less/scroller.less b/apps/common/main/resources/less/scroller.less
index d5bbf3b87c..39f70047de 100644
--- a/apps/common/main/resources/less/scroller.less
+++ b/apps/common/main/resources/less/scroller.less
@@ -21,7 +21,7 @@
                 background-color: @background-toolbar-ie;
                 background-color: @background-toolbar;
 
-                span {
+                div {
                     display: block;
                     height: 100%;
 
@@ -81,7 +81,7 @@
                     background-color: @canvas-scroll-thumb-hover;
                     background-position: center -7px;
 
-                    span {
+                    div {
                         .pixel-ratio__2_5 & {
                             background-color: @canvas-scroll-arrow-hover;
                         }
@@ -102,7 +102,7 @@
                     border-color: @canvas-scroll-thumb-border-hover;
                     background-position: center -7px;
 
-                    span {
+                    div {
                         .pixel-ratio__2_5 & {
                             background-color: @canvas-scroll-arrow-hover;
                         }
@@ -134,7 +134,7 @@
                 background-color: @background-toolbar-ie;
                 background-color: @background-toolbar;
 
-                span {
+                div {
                     display: block;
                     height: 100%;
 
@@ -194,7 +194,7 @@
                     background-color: @canvas-scroll-thumb-hover-ie;
                     background-color: @canvas-scroll-thumb-hover;
 
-                    span {
+                    div {
                         .pixel-ratio__2_5 & {
                             background-color: @canvas-scroll-arrow-hover;
                         }
@@ -214,7 +214,7 @@
                     border-color: @canvas-scroll-thumb-border-hover-ie;
                     border-color: @canvas-scroll-thumb-border-hover;
 
-                    span {
+                    div {
                         .pixel-ratio__2_5 & {
                             background-color: @canvas-scroll-arrow-hover;
                         }

From 58b538095a793e2bbdc58817abb209efdebe9902 Mon Sep 17 00:00:00 2001
From: Konstantin Kireyev <konstantin.kireyev@onlyoffice.com>
Date: Mon, 7 Oct 2024 12:23:30 +0500
Subject: [PATCH 2/2] fix: scrollbar hover colors

---
 apps/common/main/resources/less/scroller.less | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/apps/common/main/resources/less/scroller.less b/apps/common/main/resources/less/scroller.less
index 39f70047de..c864e7a354 100644
--- a/apps/common/main/resources/less/scroller.less
+++ b/apps/common/main/resources/less/scroller.less
@@ -79,9 +79,13 @@
                 &.always-visible-x {
                     background-color: @canvas-scroll-thumb-hover-ie;
                     background-color: @canvas-scroll-thumb-hover;
-                    background-position: center -7px;
 
                     div {
+                        background-position: center -7px;
+                        .pixel-ratio__1_75 & {
+                            background-position: center -6px;
+                        }
+
                         .pixel-ratio__2_5 & {
                             background-color: @canvas-scroll-arrow-hover;
                         }
@@ -100,9 +104,13 @@
                     background-color: @canvas-scroll-thumb-hover;
                     border-color: @canvas-scroll-thumb-border-hover-ie;
                     border-color: @canvas-scroll-thumb-border-hover;
-                    background-position: center -7px;
 
                     div {
+                        background-position: center -7px;
+                        .pixel-ratio__1_75 & {
+                            background-position: center -6px;
+                        }
+
                         .pixel-ratio__2_5 & {
                             background-color: @canvas-scroll-arrow-hover;
                         }
@@ -195,6 +203,11 @@
                     background-color: @canvas-scroll-thumb-hover;
 
                     div {
+                        background-position: -7px center;
+                        .pixel-ratio__1_75 & {
+                            background-position: -6px center;
+                        }
+
                         .pixel-ratio__2_5 & {
                             background-color: @canvas-scroll-arrow-hover;
                         }
@@ -215,6 +228,7 @@
                     border-color: @canvas-scroll-thumb-border-hover;
 
                     div {
+                        background-position: -7px center;
                         .pixel-ratio__2_5 & {
                             background-color: @canvas-scroll-arrow-hover;
                         }