Merge branch 'develop' into tabstrip-rtl-styles

telerik · Jan 9, 2025 · 207a322 · 207a322
2 parents ac88fd0 + 88635aa
commit 207a322
Show file tree

Hide file tree

Showing 21 changed files with 45 additions and 262 deletions.
diff --git a/packages/default/scss/toolbar/_layout.scss b/packages/default/scss/toolbar/_layout.scss
@@ -42,32 +42,31 @@
         &.k-toolbar-scrollable {
             flex-wrap: nowrap;
             position: relative;
+        }
+
+        &.k-toolbar-scrollable-overlay {
+
+            &::before,
+            &::after {
+                content: '';
+                height: 100%;
+                aspect-ratio: 1;
+                position: absolute;
+                z-index: 3;
+            }
 
-            &.k-toolbar-scrollable-overlay {
-                &::before {
-                    content: '';
-                    height: 100%;
-                    aspect-ratio: 1;
-                    position: absolute;
-                    inset-inline-start: 0;
-                    z-index: 3;
-                }
-
-                &::after {
-                    content: '';
-                    height: 100%;
-                    aspect-ratio: 1;
-                    position: absolute;
-                    inset-inline-end: 0;
-                    z-index: 3;
-                }
-
-                &.k-toolbar-scrollable-start::before,
-                &.k-toolbar-scrollable-end::after {
-                    display: none;
-                }
+            &::before {
+                inset-inline-start: 0;
+            }
+
+            &::after {
+                inset-inline-end: 0;
             }
 
+            &.k-toolbar-scrollable-start::before,
+            &.k-toolbar-scrollable-end::after {
+                display: none;
+            }
         }
 
         > * {

diff --git a/packages/fluent/scss/toolbar/_layout.scss b/packages/fluent/scss/toolbar/_layout.scss
@@ -43,30 +43,30 @@
             flex-wrap: nowrap;
             position: relative;
             margin-inline-start: calc( var( --INTERNAL--kendo-toolbar-spacing, 0 ) * -1 );
+        }
+
+        &.k-toolbar-scrollable-overlay {
+
+            &::before,
+            &::after {
+                content: '';
+                height: 100%;
+                aspect-ratio: 1;
+                position: absolute;
+                z-index: 3;
+            }
+
+            &::before {
+                inset-inline-start: var( --INTERNAL--kendo-toolbar-spacing, 0 );
+            }
+
+            &::after {
+                inset-inline-end: 0;
+            }
 
-            &.k-toolbar-scrollable-overlay {
-                &::before {
-                    content: '';
-                    height: 100%;
-                    aspect-ratio: 1;
-                    position: absolute;
-                    inset-inline-start: 0;
-                    z-index: 3;
-                }
-
-                &::after {
-                    content: '';
-                    height: 100%;
-                    aspect-ratio: 1;
-                    position: absolute;
-                    inset-inline-end: 0;
-                    z-index: 3;
-                }
-
-                &.k-toolbar-scrollable-start::before,
-                &.k-toolbar-scrollable-end::after {
-                    display: none;
-                }
+            &.k-toolbar-scrollable-start::before,
+            &.k-toolbar-scrollable-end::after {
+                display: none;
             }
         }
 

diff --git a/packages/html/src/toolbar/tests/toolbar-adaptive.tsx b/packages/html/src/toolbar/tests/toolbar-adaptive.tsx
diff --git a/tests/_output/bootstrap/toolbar/toolbar-adaptive.png b/tests/_output/bootstrap/toolbar/toolbar-adaptive.png
diff --git a/tests/_output/bootstrap/toolbar/toolbar-fill-modes.png b/tests/_output/bootstrap/toolbar/toolbar-fill-modes.png
diff --git a/tests/_output/bootstrap/toolbar/toolbar-scrollable-buttons-hidden.png b/tests/_output/bootstrap/toolbar/toolbar-scrollable-buttons-hidden.png
diff --git a/tests/_output/classic/toolbar/toolbar-adaptive.png b/tests/_output/classic/toolbar/toolbar-adaptive.png
diff --git a/tests/_output/classic/toolbar/toolbar-fill-modes.png b/tests/_output/classic/toolbar/toolbar-fill-modes.png
diff --git a/tests/_output/classic/toolbar/toolbar-scrollable-buttons-hidden.png b/tests/_output/classic/toolbar/toolbar-scrollable-buttons-hidden.png
diff --git a/tests/_output/default/toolbar/toolbar-adaptive.png b/tests/_output/default/toolbar/toolbar-adaptive.png
diff --git a/tests/_output/default/toolbar/toolbar-fill-modes.png b/tests/_output/default/toolbar/toolbar-fill-modes.png
diff --git a/tests/_output/default/toolbar/toolbar-scrollable-buttons-hidden.png b/tests/_output/default/toolbar/toolbar-scrollable-buttons-hidden.png
diff --git a/tests/_output/fluent/toolbar/toolbar-adaptive.png b/tests/_output/fluent/toolbar/toolbar-adaptive.png
diff --git a/tests/_output/fluent/toolbar/toolbar-fill-modes.png b/tests/_output/fluent/toolbar/toolbar-fill-modes.png
diff --git a/tests/_output/fluent/toolbar/toolbar-scrollable-buttons-hidden.png b/tests/_output/fluent/toolbar/toolbar-scrollable-buttons-hidden.png
diff --git a/tests/_output/material/toolbar/toolbar-adaptive.png b/tests/_output/material/toolbar/toolbar-adaptive.png
diff --git a/tests/_output/material/toolbar/toolbar-fill-modes.png b/tests/_output/material/toolbar/toolbar-fill-modes.png
diff --git a/tests/_output/material/toolbar/toolbar-scrollable-buttons-hidden.png b/tests/_output/material/toolbar/toolbar-scrollable-buttons-hidden.png
diff --git a/tests/_output/nouvelle/toolbar/toolbar-adaptive.png b/tests/_output/nouvelle/toolbar/toolbar-adaptive.png
diff --git a/tests/_output/nouvelle/toolbar/toolbar-angular.png b/tests/_output/nouvelle/toolbar/toolbar-angular.png
diff --git a/tests/toolbar/toolbar-adaptive.html b/tests/toolbar/toolbar-adaptive.html