Skip to content

Commit 45ed908

Browse files
Merge pull request #6076 from Hacker0x01/fix/inherit-font-size-624
fix: use em units for internal sizing to allow font-size inheritance
2 parents 3facb84 + 4411352 commit 45ed908

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-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

@@ -266,7 +266,7 @@ h2.react-datepicker__current-month {
266266

267267
.react-datepicker__year-text {
268268
display: inline-block;
269-
width: 4rem;
269+
width: 4em;
270270
margin: 2px;
271271
}
272272
}
@@ -278,7 +278,7 @@ h2.react-datepicker__current-month {
278278
.react-datepicker__month-text,
279279
.react-datepicker__quarter-text {
280280
display: inline-block;
281-
width: 4rem;
281+
width: 4em;
282282
margin: 2px;
283283
}
284284
}
@@ -331,7 +331,7 @@ h2.react-datepicker__current-month {
331331
&--with-today-button {
332332
display: inline;
333333
border: 1px solid #aeaeae;
334-
border-radius: 0.3rem;
334+
border-radius: 0.3em;
335335
position: absolute;
336336
right: -87px;
337337
top: 0;
@@ -340,14 +340,14 @@ h2.react-datepicker__current-month {
340340
.react-datepicker__time {
341341
position: relative;
342342
background: white;
343-
border-bottom-right-radius: 0.3rem;
343+
border-bottom-right-radius: 0.3em;
344344

345345
.react-datepicker__time-box {
346346
width: 85px;
347347
overflow-x: hidden;
348348
margin: 0 auto;
349349
text-align: center;
350-
border-bottom-right-radius: 0.3rem;
350+
border-bottom-right-radius: 0.3em;
351351

352352
ul.react-datepicker__time-list {
353353
list-style: none;
@@ -596,7 +596,7 @@ h2.react-datepicker__current-month {
596596

597597
.react-datepicker__calendar-icon {
598598
position: absolute;
599-
padding: 0.5rem;
599+
padding: 0.5em;
600600
box-sizing: content-box;
601601
}
602602
}
@@ -769,16 +769,16 @@ h2.react-datepicker__current-month {
769769
.react-datepicker__day-name,
770770
.react-datepicker__day,
771771
.react-datepicker__time-name {
772-
width: 3rem;
773-
line-height: 3rem;
772+
width: 3em;
773+
line-height: 3em;
774774
}
775775

776776
@media (max-width: 400px), (max-height: 550px) {
777777
.react-datepicker__day-name,
778778
.react-datepicker__day,
779779
.react-datepicker__time-name {
780-
width: 2rem;
781-
line-height: 2rem;
780+
width: 2em;
781+
line-height: 2em;
782782
}
783783
}
784784

@@ -789,10 +789,10 @@ h2.react-datepicker__current-month {
789789
}
790790

791791
.react-datepicker__children-container {
792-
width: 13.8rem;
793-
margin: 0.4rem;
794-
padding-right: 0.2rem;
795-
padding-left: 0.2rem;
792+
width: 13.8em;
793+
margin: 0.4em;
794+
padding-right: 0.2em;
795+
padding-left: 0.2em;
796796
height: auto;
797797
}
798798

@@ -815,5 +815,5 @@ h2.react-datepicker__current-month {
815815
}
816816

817817
.react-datepicker-popper-offset {
818-
margin-top: -0.7rem;
818+
margin-top: -0.7em;
819819
}

src/stylesheets/variables.scss

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ $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+
// stylelint-disable-next-line scss/dollar-variable-colon-space-after
21+
$datepicker__font-family:
22+
"Helvetica Neue", helvetica, arial, sans-serif !default;
23+
$datepicker__item-size: 1.7em !default;
24+
$datepicker__margin: 0.4em !default;
2325
$datepicker__navigation-button-size: 32px !default;

0 commit comments

Comments
 (0)