Skip to content

Commit 3a56e61

Browse files
authored
fix(ui5-calendar): adapt font to VD specs for secondary calendar types (#13257)
Font color and size is now correct according to the visual design specs
1 parent a8d2c7b commit 3a56e61

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

packages/main/src/themes/CalendarHeader.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
}
7171

7272
.ui5-calheader-arrowbtn:not(:active) .ui5-calheader-btn-sectext {
73-
color: var(--sapNeutralElementColor);
73+
color: var(--sapContent_LabelColor);
7474
font-size: var(--sapFontSmallSize);
7575
}
7676

packages/main/src/themes/DayPicker.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@
422422
}
423423

424424
.ui5-dp-item--withsecondtype .ui5-dp-daytext {
425-
font-size: 0.75rem;
425+
font-size: var(--_ui5_dp_item_withsecondtype_font_size);
426426
}
427427

428428
.ui5-dp-item.ui5-dp-item--withsecondtype .ui5-dp-specialday,

packages/main/src/themes/MonthPicker.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
}
4949

5050
.ui5-dp-monthsectext {
51-
font-size: 0.75rem;
52-
color: var(--sapNeutralElementColor);
51+
font-size: var(--sapFontSmallSize);
52+
color: var(--sapTextColor);
5353
}
5454

5555
.ui5-mp-item.ui5-mp-item--selected,

packages/main/src/themes/YearPicker.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
}
5151

5252
.ui5-yp-item-sec-type {
53-
font-size: 0.75rem;
54-
color: var(--sapNeutralElementColor);
53+
font-size: var(--sapFontSmallSize);
54+
color: var(--sapTextColor);
5555
}
5656

5757
.ui5-yp-item.ui5-yp-item--selected,

packages/main/src/themes/YearRangePicker.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
}
5151

5252
.ui5-yrp-item-sec-type {
53-
font-size: 0.75rem;
54-
color: var(--sapNeutralElementColor);
53+
font-size: var(--sapFontSmallSize);
54+
color: var(--sapTextColor);
5555
}
5656

5757
.ui5-yrp-item-one-column-view {

packages/main/src/themes/base/sizes-parameters.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
--_ui5_day_picker_item_height: 2.875rem;
1717
--_ui5_day_picker_empty_height: 3rem;
1818
--_ui5_day_picker_item_justify_content: space-between;
19+
--_ui5_dp_item_withsecondtype_font_size: var(--sapFontSize);
1920
--_ui5_daypicker_item_now_selected_two_calendar_focus_special_day_top: 2rem;
2021
--_ui5_daypicker_item_now_selected_two_calendar_focus_special_day_right: 1.4375rem;
2122
--_ui5_dp_two_calendar_item_secondary_text_height: 1rem;
@@ -225,6 +226,7 @@
225226
--_ui5_day_picker_item_height: 2rem;
226227
--_ui5_day_picker_empty_height: 2.125rem;
227228
--_ui5_day_picker_item_justify_content: flex-end;
229+
--_ui5_dp_item_withsecondtype_font_size: var(--sapFontSmallSize);
228230
--_ui5_dp_two_calendar_item_secondary_text_height: 0.75rem;
229231
--_ui5_dp_two_calendar_item_text_padding_top: 0.5rem;
230232

0 commit comments

Comments
 (0)