Skip to content

Commit a3b65c3

Browse files
committed
refactor(Calendar, DatePicker, DateRangePicker, TimePicker): improve RTL support
1 parent 1525ad7 commit a3b65c3

File tree

6 files changed

+20
-11
lines changed

6 files changed

+20
-11
lines changed

docs/assets/scss/docs-pickers.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,5 @@ $enable-rtl: true;
1313
// stylelint-disable selector-no-qualifying-type
1414
div[dir="rtl"] {
1515
@import "../../../scss/calendar";
16-
@import "../../../scss/date-picker";
17-
@import "../../../scss/time-picker";
1816
}
1917
// stylelint-enable selector-no-qualifying-type

scss/_date-picker.scss

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,6 @@
167167
}
168168
}
169169

170-
// .date-picker-cleaner,
171-
// .date-picker-indicator {
172-
// margin-inline-start: var(--#{$prefix}date-picker-padding-x);
173-
// }
174-
175170
.date-picker-cleaner {
176171
display: none;
177172
width: var(--#{$prefix}date-picker-cleaner-width);
@@ -257,7 +252,7 @@
257252
grid-area: ranges;
258253
width: var(--#{$prefix}date-picker-ranges-width);
259254
padding: var(--#{$prefix}date-picker-ranges-padding);
260-
border-right: var(--#{$prefix}date-picker-ranges-border-width) solid var(--#{$prefix}date-picker-ranges-border-color);
255+
border-inline-end: var(--#{$prefix}date-picker-ranges-border-width) solid var(--#{$prefix}date-picker-ranges-border-color);
261256
}
262257

263258
.date-picker-calendars {

scss/_time-picker.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
.time-picker-inline-select {
231231
padding: var(--#{$prefix}time-picker-inline-select-padding-y) var(--#{$prefix}time-picker-inline-select-padding-x);
232232
color: var(--#{$prefix}time-picker-inline-select-color);
233-
text-align: right;
233+
text-align: end;
234234
appearance: none;
235235
scrollbar-width: none; /* Firefox */
236236
background-color: transparent;
@@ -283,14 +283,14 @@
283283
}
284284

285285
&:not(:last-child) {
286-
border-right: var(--#{$prefix}time-picker-roll-col-border-width) solid var(--#{$prefix}time-picker-roll-col-border-color);
286+
border-inline-end: var(--#{$prefix}time-picker-roll-col-border-width) solid var(--#{$prefix}time-picker-roll-col-border-color);
287287
}
288288
}
289289

290290
.time-picker-roll-cell {
291291
width: 50px;
292292
height: 32px;
293-
padding: 0 $spacer 0 $spacer * .5;
293+
padding-inline: $spacer * .5 $spacer;
294294
line-height: 32px;
295295

296296
&.selected {

scss/mixins/_border-radius.scss

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,18 @@
7575
@include ltr-rtl("border-bottom-left-radius", valid-radius($radius));
7676
}
7777
}
78+
79+
@mixin border-start-radius-flex($radius: $border-radius) {
80+
@if $enable-rounded {
81+
border-start-start-radius: valid-radius($radius);
82+
border-end-start-radius: valid-radius($radius);
83+
}
84+
}
85+
86+
@mixin border-end-radius-flex($radius: $border-radius) {
87+
@if $enable-rounded {
88+
border-start-end-radius: valid-radius($radius);
89+
border-end-end-radius: valid-radius($radius);
90+
}
91+
}
7892
// scss-docs-end border-radius-mixins

scss/themes/bootstrap/bootstrap.rtl.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ $enable-rtl: true !default;
99

1010
/* rtl:begin:ignore */
1111
@import "../../mixins/avatar";
12+
@import "../../mixins/border-radius";
1213
@import "../../mixins/elevation";
1314
@import "../../mixins/icon";
1415
@import "../../mixins/ltr-rtl";

scss/themes/bootstrap/bootstrap.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
/* rtl:begin:ignore */
88
@import "../../mixins/avatar";
9+
@import "../../mixins/border-radius";
910
@import "../../mixins/elevation";
1011
@import "../../mixins/icon";
1112
@import "../../mixins/ltr-rtl";

0 commit comments

Comments
 (0)