Merge pull request 'fix bug 70677' (#60) from fix/bug-70677 into rele…

…ase/v8.2.0
ONLYOFFICE · Oct 7, 2024 · b22a213 · b22a213
2 parents a26f960 + 58b5380
commit b22a213
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git 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
@@ -21,7 +21,7 @@
                 background-color: @background-toolbar-ie;
                 background-color: @background-toolbar;
 
-                span {
+                div {
                     display: block;
                     height: 100%;
 
@@ -79,9 +79,13 @@
                 &.always-visible-x {
                     background-color: @canvas-scroll-thumb-hover-ie;
                     background-color: @canvas-scroll-thumb-hover;
-                    background-position: center -7px;
 
-                    span {
+                    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;
 
-                    span {
+                    div {
+                        background-position: center -7px;
+                        .pixel-ratio__1_75 & {
+                            background-position: center -6px;
+                        }
+
                         .pixel-ratio__2_5 & {
                             background-color: @canvas-scroll-arrow-hover;
                         }
@@ -134,7 +142,7 @@
                 background-color: @background-toolbar-ie;
                 background-color: @background-toolbar;
 
-                span {
+                div {
                     display: block;
                     height: 100%;
 
@@ -194,7 +202,12 @@
                     background-color: @canvas-scroll-thumb-hover-ie;
                     background-color: @canvas-scroll-thumb-hover;
 
-                    span {
+                    div {
+                        background-position: -7px center;
+                        .pixel-ratio__1_75 & {
+                            background-position: -6px center;
+                        }
+
                         .pixel-ratio__2_5 & {
                             background-color: @canvas-scroll-arrow-hover;
                         }
@@ -214,7 +227,8 @@
                     border-color: @canvas-scroll-thumb-border-hover-ie;
                     border-color: @canvas-scroll-thumb-border-hover;
 
-                    span {
+                    div {
+                        background-position: -7px center;
                         .pixel-ratio__2_5 & {
                             background-color: @canvas-scroll-arrow-hover;
                         }