Skip to content

Commit 74ef171

Browse files
committed
Merge pull request #5013 from ShayArtzi/rtl-pagination-fix
fix(rtl): Fixed pagination button direction in RTL
2 parents d6a4030 + 9d5d22d commit 74ef171

File tree

2 files changed

+31
-13
lines changed

2 files changed

+31
-13
lines changed

src/features/pagination/less/pagination.less

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
@import (reference) "../../../less/bootstrap/bootstrap";
44

55
.ui-grid-pager-panel {
6-
position: absolute;
7-
left: 0;
8-
bottom: 0;
9-
width: 100%;
10-
padding-top: 3px;
11-
padding-bottom: 3px;
12-
box-sizing: content-box;
6+
position: absolute;
7+
left: 0;
8+
bottom: 0;
9+
width: 100%;
10+
padding-top: 3px;
11+
padding-bottom: 3px;
12+
box-sizing: content-box;
1313
}
1414

1515
.ui-grid-pager-container {
@@ -53,6 +53,14 @@
5353
margin-left: -3px;
5454
}
5555

56+
.first-bar-rtl {
57+
width: 10px;
58+
border-left: 2px solid #4d4d4d;
59+
margin-top: -6px;
60+
height: 12px;
61+
margin-right: -7px;
62+
}
63+
5664
.first-triangle {
5765
width: 0;
5866
height: 0;
@@ -86,6 +94,16 @@
8694
height: 12px;
8795
margin-left: 1px;
8896
}
97+
98+
.last-bar-rtl {
99+
width: 10px;
100+
border-left: 2px solid #4d4d4d;
101+
margin-top: -6px;
102+
height: 12px;
103+
margin-right: -11px;
104+
}
105+
106+
89107
}
90108

91109
.ui-grid-pager-row-count-picker {

src/features/pagination/templates/pagination.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
ng-click="pageFirstPageClick()"
1919
ng-disabled="cantPageBackward()">
2020
<div
21-
class="first-triangle">
21+
ng-class="grid.isRTL() ? 'last-triangle' : 'first-triangle'">
2222
<div
23-
class="first-bar">
23+
ng-class="grid.isRTL() ? 'last-bar-rtl' : 'first-bar'">
2424
</div>
2525
</div>
2626
</button>
@@ -32,7 +32,7 @@
3232
ui-grid-one-bind-aria-label="aria.pageBack"
3333
ng-click="pagePreviousPageClick()"
3434
ng-disabled="cantPageBackward()">
35-
<div class="first-triangle prev-triangle"></div>
35+
<div ng-class="grid.isRTL() ? 'last-triangle prev-triangle' : 'first-triangle prev-triangle'"></div>
3636
</button>
3737
<input
3838
type="number"
@@ -60,7 +60,7 @@
6060
ui-grid-one-bind-aria-label="aria.pageForward"
6161
ng-click="pageNextPageClick()"
6262
ng-disabled="cantPageForward()">
63-
<div class="last-triangle next-triangle"></div>
63+
<div ng-class="grid.isRTL() ? 'first-triangle next-triangle' : 'last-triangle next-triangle'"></div>
6464
</button>
6565
<button
6666
type="button"
@@ -70,8 +70,8 @@
7070
ui-grid-one-bind-aria-label="aria.pageToLast"
7171
ng-click="pageLastPageClick()"
7272
ng-disabled="cantPageToLast()">
73-
<div class="last-triangle">
74-
<div class="last-bar">
73+
<div ng-class="grid.isRTL() ? 'first-triangle' : 'last-triangle'">
74+
<div ng-class="grid.isRTL() ? 'first-bar-rtl' : 'last-bar'">
7575
</div>
7676
</div>
7777
</button>

0 commit comments

Comments
 (0)