Skip to content

Commit d7f21c6

Browse files
fix: use em units for internal sizing to allow font-size inheritance
Converts internal sizing units from rem to em in the datepicker stylesheets. This allows users to easily inherit font size from parent elements by overriding the root .react-datepicker font-size to 'inherit' or '1em'. The default appearance remains unchanged since the root element still uses font-size: 0.8rem. Fixes #624
1 parent f11433c commit d7f21c6

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

src/stylesheets/datepicker.scss

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242

4343
.react-datepicker__time,
4444
.react-datepicker__time-box {
45-
border-bottom-left-radius: 0.3rem;
46-
border-bottom-right-radius: 0.3rem;
45+
border-bottom-left-radius: 0.3em;
46+
border-bottom-right-radius: 0.3em;
4747
}
4848
}
4949

@@ -222,7 +222,7 @@ h2.react-datepicker__current-month {
222222

223223
.react-datepicker__year-text {
224224
display: inline-block;
225-
width: 4rem;
225+
width: 4em;
226226
margin: 2px;
227227
}
228228
}
@@ -234,7 +234,7 @@ h2.react-datepicker__current-month {
234234
.react-datepicker__month-text,
235235
.react-datepicker__quarter-text {
236236
display: inline-block;
237-
width: 4rem;
237+
width: 4em;
238238
margin: 2px;
239239
}
240240
}
@@ -287,7 +287,7 @@ h2.react-datepicker__current-month {
287287
&--with-today-button {
288288
display: inline;
289289
border: 1px solid #aeaeae;
290-
border-radius: 0.3rem;
290+
border-radius: 0.3em;
291291
position: absolute;
292292
right: -87px;
293293
top: 0;
@@ -296,14 +296,14 @@ h2.react-datepicker__current-month {
296296
.react-datepicker__time {
297297
position: relative;
298298
background: white;
299-
border-bottom-right-radius: 0.3rem;
299+
border-bottom-right-radius: 0.3em;
300300

301301
.react-datepicker__time-box {
302302
width: 85px;
303303
overflow-x: hidden;
304304
margin: 0 auto;
305305
text-align: center;
306-
border-bottom-right-radius: 0.3rem;
306+
border-bottom-right-radius: 0.3em;
307307

308308
ul.react-datepicker__time-list {
309309
list-style: none;
@@ -552,7 +552,7 @@ h2.react-datepicker__current-month {
552552

553553
.react-datepicker__calendar-icon {
554554
position: absolute;
555-
padding: 0.5rem;
555+
padding: 0.5em;
556556
box-sizing: content-box;
557557
}
558558
}
@@ -725,16 +725,16 @@ h2.react-datepicker__current-month {
725725
.react-datepicker__day-name,
726726
.react-datepicker__day,
727727
.react-datepicker__time-name {
728-
width: 3rem;
729-
line-height: 3rem;
728+
width: 3em;
729+
line-height: 3em;
730730
}
731731

732732
@media (max-width: 400px), (max-height: 550px) {
733733
.react-datepicker__day-name,
734734
.react-datepicker__day,
735735
.react-datepicker__time-name {
736-
width: 2rem;
737-
line-height: 2rem;
736+
width: 2em;
737+
line-height: 2em;
738738
}
739739
}
740740

@@ -745,10 +745,10 @@ h2.react-datepicker__current-month {
745745
}
746746

747747
.react-datepicker__children-container {
748-
width: 13.8rem;
749-
margin: 0.4rem;
750-
padding-right: 0.2rem;
751-
padding-left: 0.2rem;
748+
width: 13.8em;
749+
margin: 0.4em;
750+
padding-right: 0.2em;
751+
padding-left: 0.2em;
752752
height: auto;
753753
}
754754

@@ -771,5 +771,5 @@ h2.react-datepicker__current-month {
771771
}
772772

773773
.react-datepicker-popper-offset {
774-
margin-top: -0.7rem;
774+
margin-top: -0.7em;
775775
}

src/stylesheets/variables.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ $datepicker__navigation-disabled-color: color.adjust(
1515
) !default;
1616
$datepicker__border: 1px solid $datepicker__border-color;
1717
$datepicker__border-radius: 0.3rem !default;
18-
$datepicker__day-margin: 0.166rem !default;
18+
$datepicker__day-margin: 0.166em !default;
1919
$datepicker__font-size: 0.8rem !default;
20-
$datepicker__font-family: "Helvetica Neue", helvetica, arial, sans-serif !default;
21-
$datepicker__item-size: 1.7rem !default;
22-
$datepicker__margin: 0.4rem !default;
20+
$datepicker__font-family:
21+
"Helvetica Neue", helvetica, arial, sans-serif !default;
22+
$datepicker__item-size: 1.7em !default;
23+
$datepicker__margin: 0.4em !default;
2324
$datepicker__navigation-button-size: 32px !default;

0 commit comments

Comments
 (0)