Skip to content

Commit

Permalink
fix(grid): add support for sort-asc-small and sort-desc-small icons
Browse files Browse the repository at this point in the history
  • Loading branch information
@TeyaVes @joneff
TeyaVes authored and joneff committed Aug 26, 2022
1 parent 59f8ca9 commit f1196db
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 21 deletions.
2 changes: 2 additions & 0 deletions packages/bootstrap/scss/grid/_theme.scss
View file
Expand Up @@ -141,6 +141,8 @@

.k-i-sort-asc-sm,
.k-i-sort-desc-sm,
.k-i-sort-asc-small,
.k-i-sort-desc-small,
.k-sort-order {
color: $grid-sorting-indicator-text;
}
Expand Down
4 changes: 3 additions & 1 deletion packages/default/scss/grid/_layout.scss
View file
Expand Up @@ -662,7 +662,9 @@

.k-cell-inner > .k-link > .k-icon {
&.k-i-sort-desc-sm,
&.k-i-sort-asc-sm {
&.k-i-sort-asc-sm,
&.k-i-sort-asc-small,
&.k-i-sort-desc-small {
vertical-align: text-top;
margin-inline-start: $grid-sorted-icon-spacing;
}
Expand Down
2 changes: 2 additions & 0 deletions packages/default/scss/grid/_theme.scss
View file
Expand Up @@ -185,6 +185,8 @@

.k-i-sort-asc-sm,
.k-i-sort-desc-sm,
.k-i-sort-asc-small,
.k-i-sort-desc-small,
.k-sort-order {
color: $grid-sorting-indicator-text;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/html/src/grid/tests/grid-filter-menu-popup-angular.html
View file
Expand Up @@ -58,12 +58,12 @@
<kendo-grid-columnmenu-sort class="k-columnmenu-item-wrapper ng-star-inserted">
<kendo-grid-columnmenu-item>
<div class="k-columnmenu-item">
<span class="k-icon k-i-sort-asc-sm"></span> Sort Ascending
<span class="k-icon k-i-sort-asc-small"></span> Sort Ascending
</div>
</kendo-grid-columnmenu-item>
<kendo-grid-columnmenu-item>
<div role="button" class="k-columnmenu-item">
<span class="k-icon k-i-sort-desc-sm"></span> Sort Descending
<span class="k-icon k-i-sort-desc-small"></span> Sort Descending
</div>
</kendo-grid-columnmenu-item>
</kendo-grid-columnmenu-sort>
Expand Down
18 changes: 9 additions & 9 deletions packages/html/src/grid/tests/grid-header-new-rendering-rtl.html
View file
Expand Up @@ -28,7 +28,7 @@
<span class="k-column-title">
ProductName
</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">3</span>
</span>
<span class="k-sort-status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand All @@ -40,7 +40,7 @@
<span class="k-column-title">
Discontinued
</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">1</span>
</span>
<span class="k-sort-status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand All @@ -52,7 +52,7 @@
<span class="k-column-title">
UnitsInStock
</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">2</span>
</span>
<span class="k-sort-status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand Down Expand Up @@ -83,7 +83,7 @@
<span class="k-cell-inner">
<span class="k-link">
<span class="k-column-title">ProductName</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">2</span>
</span>
<span class="k-sort-status" role="status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand All @@ -96,7 +96,7 @@
<span class="k-cell-inner">
<span class="k-link">
<span class="k-column-title">Discontinued</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">2</span>
</span>
<span class="k-sort-status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand All @@ -109,7 +109,7 @@
<span class="k-cell-inner">
<span class="k-link">
<span class="k-column-title">UnitsInStockUnitsInStockUnitsInStockvvvv</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">3</span>
</span>
<span class="k-sort-status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand Down Expand Up @@ -146,7 +146,7 @@
<span class="k-column-title">
ProductName
</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">1</span>
</span>
<span class="k-sort-status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand All @@ -162,7 +162,7 @@
<span class="k-link">
<span class="k-column-title">Discontinued Discontinued Discontinued
</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>

<span class="k-sort-order">2</span>
</span>
Expand All @@ -179,7 +179,7 @@
<span class="k-link">
<span class="k-column-title">UnitsInStock
</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">3</span>
</span>
<span class="k-sort-status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand Down
18 changes: 9 additions & 9 deletions packages/html/src/grid/tests/grid-header-new-rendering.html
View file
Expand Up @@ -28,7 +28,7 @@
<span class="k-column-title">
ProductName
</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">3</span>
</span>
<span class="k-sort-status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand All @@ -40,7 +40,7 @@
<span class="k-column-title">
Discontinued
</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">1</span>
</span>
<span class="k-sort-status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand All @@ -52,7 +52,7 @@
<span class="k-column-title">
UnitsInStock
</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">2</span>
</span>
<span class="k-sort-status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand Down Expand Up @@ -83,7 +83,7 @@
<span class="k-cell-inner">
<span class="k-link">
<span class="k-column-title">ProductName</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">2</span>
</span>
<span class="k-sort-status" role="status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand All @@ -96,7 +96,7 @@
<span class="k-cell-inner">
<span class="k-link">
<span class="k-column-title">Discontinued</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">2</span>
</span>
<span class="k-sort-status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand All @@ -109,7 +109,7 @@
<span class="k-cell-inner">
<span class="k-link">
<span class="k-column-title">UnitsInStockUnitsInStockUnitsInStockvvvv</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">3</span>
</span>
<span class="k-sort-status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand Down Expand Up @@ -146,7 +146,7 @@
<span class="k-column-title">
ProductName
</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">1</span>
</span>
<span class="k-sort-status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand All @@ -162,7 +162,7 @@
<span class="k-link">
<span class="k-column-title">Discontinued Discontinued Discontinued
</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>

<span class="k-sort-order">2</span>
</span>
Expand All @@ -179,7 +179,7 @@
<span class="k-link">
<span class="k-column-title">UnitsInStock
</span>
<span class="k-icon k-i-sort-asc-sm"></span>
<span class="k-icon k-i-sort-asc-small"></span>
<span class="k-sort-order">3</span>
</span>
<span class="k-sort-status" style="position: absolute; left: -10000px;">Sorted Ascending</span>
Expand Down

0 comments on commit f1196db

Please sign in to comment.