Skip to content

Commit

Permalink
Merge branch 'develop' into tabstrip-toolbar-overlay
Browse files Browse the repository at this point in the history
  • Loading branch information
TeyaVes authored Jan 9, 2025
2 parents 8159e33 + 4c88fbd commit 307369b
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 2 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
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
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 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 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 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 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.

0 comments on commit 307369b

Please sign in to comment.