Skip to content

Commit

Permalink
Merge branch 'develop' into expose-chart-css-vars
Browse files Browse the repository at this point in the history
  • Loading branch information
epetrow authored Jan 10, 2025
2 parents 2502e33 + 98df004 commit 74e0932
Show file tree
Hide file tree
Showing 29 changed files with 75 additions and 278 deletions.
8 changes: 8 additions & 0 deletions packages/default/scss/tabstrip/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,10 @@
.k-item {
@include border-top-radius( $kendo-tabstrip-item-border-radius );
border-bottom-width: 0;

.k-link {
justify-content: center;
}
}
.k-item:active,
.k-item.k-active {
Expand All @@ -304,6 +308,10 @@
.k-item {
@include border-bottom-radius( $kendo-tabstrip-item-border-radius );
border-top-width: 0;

.k-link {
justify-content: center;
}
}
.k-item:active,
.k-item.k-active {
Expand Down
28 changes: 14 additions & 14 deletions packages/default/scss/tabstrip/_theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -129,21 +129,21 @@
}
}
}
}

// 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);
// 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);
}
}
}
}
Expand Down
45 changes: 22 additions & 23 deletions packages/default/scss/toolbar/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

> * {
Expand Down
10 changes: 8 additions & 2 deletions packages/fluent/scss/tabstrip/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,10 @@

.k-item {
margin-block-end: calc( var( --kendo-tabstrip-border-width, #{$kendo-tabstrip-border-width} ) * -1 );

.k-link {
justify-content: center;
}
}

}
Expand All @@ -282,8 +286,11 @@

.k-item {
margin-block-start: calc( var( --kendo-tabstrip-border-width, #{$kendo-tabstrip-border-width} ) * -1 );
}

.k-link {
justify-content: center;
}
}
}
}
.k-tabstrip-left {
Expand Down Expand Up @@ -338,7 +345,6 @@
flex: 1 0 0;
}


// Selected indicator
@if ($kendo-tabstrip-indicator-size) {

Expand Down
46 changes: 23 additions & 23 deletions packages/fluent/scss/toolbar/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down
57 changes: 0 additions & 57 deletions packages/html/src/toolbar/tests/toolbar-adaptive.tsx

This file was deleted.

Binary file modified tests/_output/bootstrap/tabstrip/tabstrip-alignment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed tests/_output/bootstrap/toolbar/toolbar-adaptive.png
Binary file not shown.
Binary file modified tests/_output/bootstrap/toolbar/toolbar-fill-modes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/tabstrip/tabstrip-alignment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed tests/_output/classic/toolbar/toolbar-adaptive.png
Binary file not shown.
Binary file modified tests/_output/classic/toolbar/toolbar-fill-modes.png
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/toolbar/toolbar-scrollable-buttons-hidden.png
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/tabstrip/tabstrip-alignment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed tests/_output/default/toolbar/toolbar-adaptive.png
Binary file not shown.
Binary file modified tests/_output/default/toolbar/toolbar-fill-modes.png
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/toolbar/toolbar-scrollable-buttons-hidden.png
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/tabstrip/tabstrip-alignment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed tests/_output/fluent/toolbar/toolbar-adaptive.png
Binary file not shown.
Binary file modified tests/_output/fluent/toolbar/toolbar-fill-modes.png
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/toolbar/toolbar-scrollable-buttons-hidden.png
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/tabstrip/tabstrip-alignment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed tests/_output/material/toolbar/toolbar-adaptive.png
Binary file not shown.
Binary file modified tests/_output/material/toolbar/toolbar-fill-modes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed tests/_output/nouvelle/toolbar/toolbar-adaptive.png
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 74e0932

Please sign in to comment.