Skip to content

Commit

Permalink
Merge branch 'develop' into toolbar-scroll-buttons-rendering
Browse files Browse the repository at this point in the history
  • Loading branch information
@TeyaVes
TeyaVes authored Jan 24, 2025
2 parents 6a74cc4 + 63c3bec commit e1f9fd8
Show file tree
Hide file tree
Showing 15 changed files with 66 additions and 69 deletions.
4 changes: 4 additions & 0 deletions packages/core/scss/components/colorgradient/_layout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@
flex-shrink: 0;
gap: $kendo-color-gradient-canvas-gap;
}

&.k-vstack {
padding-inline: calc( ($kendo-color-gradient-draghandle-width + $kendo-color-gradient-draghandle-outline-width + $kendo-color-gradient-draghandle-border-width) / 2 );
}
}

// DragHandle
Expand Down
1 change: 1 addition & 0 deletions packages/core/scss/components/tabstrip/_layout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
border-style: solid;
border-color: inherit;
position: relative;
flex-shrink: 0;
}


Expand Down
23 changes: 10 additions & 13 deletions packages/core/scss/components/tabstrip/_theme.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,19 +131,16 @@
}

// RTL
.k-rtl,
[dir="rtl"] {
&.k-tabstrip-scrollable-overlay {
&.k-tabstrip-top,
&.k-tabstrip-bottom {
.k-tabstrip-items-wrapper {
&::before {
background: linear-gradient(270deg, $kendo-tabstrip-scroll-overlay);
}

&::after {
background: linear-gradient(90deg, $kendo-tabstrip-scroll-overlay);
}
:is(.k-rtl .k-tabstrip-scrollable-overlay, [dir="rtl"] .k-tabstrip-scrollable-overlay, .k-tabstrip-scrollable-overlay.k-rtl, .k-tabstrip-scrollable-overlay[dir="rtl"] ) {
&.k-tabstrip-top,
&.k-tabstrip-bottom {
.k-tabstrip-items-wrapper {
&::before {
background: linear-gradient(270deg, $kendo-tabstrip-scroll-overlay);
}

&::after {
background: linear-gradient(90deg, $kendo-tabstrip-scroll-overlay);
}
}
}
Expand Down
40 changes: 18 additions & 22 deletions packages/core/scss/components/toolbar/_theme.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,39 +156,35 @@
}

// RTL
.k-rtl,
[dir="rtl"] {
.k-toolbar-scrollable-overlay {
:is(.k-rtl .k-toolbar-scrollable-overlay, [dir="rtl"] .k-toolbar-scrollable-overlay, .k-toolbar-scrollable-overlay.k-rtl, .k-toolbar-scrollable-overlay[dir="rtl"] ) {
&::before {
background: linear-gradient(270deg, $kendo-toolbar-scroll-overlay);
}

&::after {
background: linear-gradient(90deg, $kendo-toolbar-scroll-overlay);
}

&.k-toolbar-outline {
&::before {
background: linear-gradient(270deg, $kendo-toolbar-scroll-overlay);
background: linear-gradient(270deg, $kendo-toolbar-outline-scroll-overlay);
}

&::after {
background: linear-gradient(90deg, $kendo-toolbar-scroll-overlay);
background: linear-gradient(90deg, $kendo-toolbar-outline-scroll-overlay);
}
}

&.k-toolbar-outline {
&::before {
background: linear-gradient(270deg, $kendo-toolbar-outline-scroll-overlay);
}

&::after {
background: linear-gradient(90deg, $kendo-toolbar-outline-scroll-overlay);
}
&.k-toolbar-flat {
&::before {
background: linear-gradient(270deg, $kendo-toolbar-flat-scroll-overlay);
}

&.k-toolbar-flat {
&::before {
background: linear-gradient(270deg, $kendo-toolbar-flat-scroll-overlay);
}

&::after {
background: linear-gradient(90deg, $kendo-toolbar-flat-scroll-overlay);
}
&::after {
background: linear-gradient(90deg, $kendo-toolbar-flat-scroll-overlay);
}
}
}

}


Expand Down
4 changes: 4 additions & 0 deletions packages/fluent/scss/colorgradient/_layout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@
flex-shrink: 0;
gap: var( --kendo-color-gradient-canvas-spacing, #{$kendo-color-gradient-canvas-spacing} );
}

&.k-vstack {
padding-inline: calc( ($kendo-color-gradient-draghandle-width + $kendo-color-gradient-draghandle-border-width) / 2 );
}
}

// DragHandle
Expand Down
1 change: 1 addition & 0 deletions packages/fluent/scss/tabstrip/_layout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
border-style: solid;
border-color: inherit;
position: relative;
flex-shrink: 0;
}


Expand Down
23 changes: 10 additions & 13 deletions packages/fluent/scss/tabstrip/_theme.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,19 +129,16 @@
}

// RTL
.k-rtl,
[dir="rtl"] {
&.k-tabstrip-scrollable-overlay {
&.k-tabstrip-top,
&.k-tabstrip-bottom {
.k-tabstrip-items-wrapper {
&::before {
background: linear-gradient(270deg, $kendo-tabstrip-scroll-overlay);
}

&::after {
background: linear-gradient(90deg, $kendo-tabstrip-scroll-overlay);
}
:is(.k-rtl .k-tabstrip-scrollable-overlay, [dir="rtl"] .k-tabstrip-scrollable-overlay, .k-tabstrip-scrollable-overlay.k-rtl, .k-tabstrip-scrollable-overlay[dir="rtl"] ) {
&.k-tabstrip-top,
&.k-tabstrip-bottom {
.k-tabstrip-items-wrapper {
&::before {
background: linear-gradient(270deg, $kendo-tabstrip-scroll-overlay);
}

&::after {
background: linear-gradient(90deg, $kendo-tabstrip-scroll-overlay);
}
}
}
Expand Down
39 changes: 18 additions & 21 deletions packages/fluent/scss/toolbar/_theme.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,35 +146,32 @@
}

// RTL
.k-rtl,
[dir="rtl"] {
.k-toolbar-scrollable-overlay {
:is(.k-rtl .k-toolbar-scrollable-overlay, [dir="rtl"] .k-toolbar-scrollable-overlay, .k-toolbar-scrollable-overlay.k-rtl, .k-toolbar-scrollable-overlay[dir="rtl"] ) {
&::before {
background: linear-gradient(270deg, var(--kendo-toolbar-scroll-overlay, #{$kendo-toolbar-scroll-overlay}));
}

&::after {
background: linear-gradient(90deg, var(--kendo-toolbar-scroll-overlay, #{$kendo-toolbar-scroll-overlay}));
}

&.k-toolbar-outline {
&::before {
background: linear-gradient(270deg, var( --kendo-toolbar-scroll-overlay, #{$kendo-toolbar-scroll-overlay} ));
background: linear-gradient(270deg, var(--kendo-toolbar-outline-scroll-overlay, #{$kendo-toolbar-outline-scroll-overlay}));
}

&::after {
background: linear-gradient(90deg, var( --kendo-toolbar-scroll-overlay, #{$kendo-toolbar-scroll-overlay} ));
background: linear-gradient(90deg, var(--kendo-toolbar-outline-scroll-overlay, #{$kendo-toolbar-outline-scroll-overlay}));
}
}

&.k-toolbar-outline {
&::before {
background: linear-gradient(270deg, var( --kendo-toolbar-outline-scroll-overlay, #{$kendo-toolbar-outline-scroll-overlay} ));
}

&::after {
background: linear-gradient(90deg, var( --kendo-toolbar-outline-scroll-overlay, #{$kendo-toolbar-outline-scroll-overlay} ));
}
&.k-toolbar-flat {
&::before {
background: linear-gradient(270deg, var(--kendo-toolbar-flat-scroll-overlay, #{$kendo-toolbar-flat-scroll-overlay}));
}

&.k-toolbar-flat {
&::before {
background: linear-gradient(270deg, var( --kendo-toolbar-flat-scroll-overlay, #{$kendo-toolbar-flat-scroll-overlay} ));
}

&::after {
background: linear-gradient(90deg, var( --kendo-toolbar-flat-scroll-overlay, #{$kendo-toolbar-flat-scroll-overlay} ));
}
&::after {
background: linear-gradient(90deg, var(--kendo-toolbar-flat-scroll-overlay, #{$kendo-toolbar-flat-scroll-overlay}));
}
}
}
Expand Down
Binary file modified tests/_output/bootstrap/colorpicker/colorpicker-adaptive.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/_output/bootstrap/tabstrip/tabstrip-rtl.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/_output/bootstrap/tabstrip/tabstrip.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/_output/classic/colorpicker/colorpicker-adaptive.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/_output/default/colorpicker/colorpicker-adaptive.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/_output/fluent/colorpicker/colorpicker-adaptive.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/_output/material/colorpicker/colorpicker-adaptive.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e1f9fd8

Please sign in to comment.