Skip to content

Commit 7253d2f

Browse files
Merge pull request #3998 from Recras/master
Replace all `rem` units with `em` units
2 parents af827cc + 948fadb commit 7253d2f

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

src/stylesheets/datepicker.scss

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
.react-datepicker__time,
3232
.react-datepicker__time-box {
33-
border-bottom-left-radius: 0.3rem;
34-
border-bottom-right-radius: 0.3rem;
33+
border-bottom-left-radius: 0.3em;
34+
border-bottom-right-radius: 0.3em;
3535
}
3636
}
3737

@@ -231,7 +231,7 @@
231231

232232
.react-datepicker__year-text {
233233
display: inline-block;
234-
width: 4rem;
234+
width: 4em;
235235
margin: 2px;
236236
}
237237
}
@@ -243,7 +243,7 @@
243243
.react-datepicker__month-text,
244244
.react-datepicker__quarter-text {
245245
display: inline-block;
246-
width: 4rem;
246+
width: 4em;
247247
margin: 2px;
248248
}
249249
}
@@ -296,7 +296,7 @@
296296
&--with-today-button {
297297
display: inline;
298298
border: 1px solid #aeaeae;
299-
border-radius: 0.3rem;
299+
border-radius: 0.3em;
300300
position: absolute;
301301
right: -87px;
302302
top: 0;
@@ -305,14 +305,14 @@
305305
.react-datepicker__time {
306306
position: relative;
307307
background: white;
308-
border-bottom-right-radius: 0.3rem;
308+
border-bottom-right-radius: 0.3em;
309309

310310
.react-datepicker__time-box {
311311
width: 85px;
312312
overflow-x: hidden;
313313
margin: 0 auto;
314314
text-align: center;
315-
border-bottom-right-radius: 0.3rem;
315+
border-bottom-right-radius: 0.3em;
316316

317317
ul.react-datepicker__time-list {
318318
list-style: none;
@@ -479,7 +479,7 @@
479479

480480
.react-datepicker__calendar-icon {
481481
position: absolute;
482-
padding: 0.5rem;
482+
padding: 0.5em;
483483
}
484484
}
485485

@@ -633,16 +633,16 @@
633633
.react-datepicker__day-name,
634634
.react-datepicker__day,
635635
.react-datepicker__time-name {
636-
width: 3rem;
637-
line-height: 3rem;
636+
width: 3em;
637+
line-height: 3em;
638638
}
639639

640640
@media (max-width: 400px), (max-height: 550px) {
641641
.react-datepicker__day-name,
642642
.react-datepicker__day,
643643
.react-datepicker__time-name {
644-
width: 2rem;
645-
line-height: 2rem;
644+
width: 2em;
645+
line-height: 2em;
646646
}
647647
}
648648

@@ -653,10 +653,10 @@
653653
}
654654

655655
.react-datepicker__children-container {
656-
width: 13.8rem;
657-
margin: 0.4rem;
658-
padding-right: 0.2rem;
659-
padding-left: 0.2rem;
656+
width: 13.8em;
657+
margin: 0.4em;
658+
padding-right: 0.2em;
659+
padding-left: 0.2em;
660660
height: auto;
661661
}
662662

src/stylesheets/variables.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ $datepicker__navigation-disabled-color: lighten(
1010
10%
1111
) !default;
1212

13-
$datepicker__border-radius: 0.3rem !default;
14-
$datepicker__day-margin: 0.166rem !default;
15-
$datepicker__font-size: 0.8rem !default;
13+
$datepicker__border-radius: 0.3em !default;
14+
$datepicker__day-margin: 0.166em !default;
15+
$datepicker__font-size: 0.8em !default;
1616
$datepicker__font-family: "Helvetica Neue", helvetica, arial, sans-serif !default;
17-
$datepicker__item-size: 1.7rem !default;
18-
$datepicker__margin: 0.4rem !default;
17+
$datepicker__item-size: 1.7em !default;
18+
$datepicker__margin: 0.4em !default;
1919
$datepicker__navigation-button-size: 32px !default;
2020
$datepicker__triangle-size: 8px !default;

0 commit comments

Comments
 (0)