Skip to content

Commit

Permalink
fix(ui5-calendar, ui5-daterange-picker): align range selection stylin…
Browse files Browse the repository at this point in the history
…g with vd specification (#8585)

align range selection styling to VD specification
  • Loading branch information
hinzzx committed Apr 11, 2024
1 parent 4594e9a commit d4f0e0e
Show file tree
Hide file tree
Showing 10 changed files with 6 additions and 17 deletions.
9 changes: 3 additions & 6 deletions packages/main/src/themes/DayPicker.css
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,8 @@
outline: none;
}

.ui5-dp-item.ui5-dp-item--selected-between .ui5-dp-daytext,
.ui5-dp-item[hovered] .ui5-dp-daytext {
border: var(--_ui5_daypicker_item_select_between_border);
.ui5-dp-item.ui5-dp-item--selected-between .ui5-dp-daytext {
border-radius: var(--_ui5_daypicker_item_border_radius);
background-color: var(--_ui5_daypicker_item_selected_between_text_background);
color: var(--sapTextColor);
font-weight: var(--_ui5_daypicker_item_selected_between_text_font);
}
Expand All @@ -240,8 +237,8 @@
border-radius: var(--_ui5_daypicker_item_now_selected_between_border_radius);
}

.ui5-dp-item.ui5-dp-item--selected-between,
.ui5-dp-item[hovered] {
.ui5-dp-item.ui5-dp-item--selected-between {
border: var(--_ui5_daypicker_item_select_between_border);
border-radius: var(--_ui5_daypicker_item_selected_between_border);
background: var(--_ui5_daypicker_item_selected_between_background);
}
Expand Down
6 changes: 3 additions & 3 deletions packages/main/src/themes/base/DayPicker-parameters.css
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
--_ui5_daypicker_item_now_outline: none;
--_ui5_daypicker_item_now_outline_offset: none;
--_ui5_daypicker_item_now_outline_offset_focus_after: var(--_ui5_daypicker_item_now_outline_offset);
--_ui5_daypicker_item_selected_between_border: 5%;
--_ui5_daypicker_item_selected_between_background: transparent;
--_ui5_daypicker_item_selected_between_border: 0.25rem;
--_ui5_daypicker_item_selected_between_background: var(--sapList_SelectionBackgroundColor);
--_ui5_daypicker_item_selected_between_text_background: var(--sapList_SelectionBackgroundColor);
--_ui5_daypicker_item_selected_between_text_font: inherit;
--_ui5_daypicker_item_selected_between_hover_background: inherit;
--_ui5_daypicker_item_selected_between_hover_background: var(--sapList_Hover_SelectionBackground);
--_ui5_daypicker_item_now_box_shadow: inset 0 0 0 0.0625rem var(--_ui5_daypicker_item_selected_border_color);
--_ui5_daypicker_item_selected_text_outline: none;
--_ui5_daypicker_item_now_not_selected_inset: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
--_ui5_daypicker_item_selected_between_text_background: transparent;
--_ui5_daypicker_item_selected_between_text_font: var(--sapFontFamily);
--_ui5_daypicker_item_selected_text_font: var(--sapFontBoldFamily);
--_ui5_daypicker_item_selected_between_hover_background: var(--sapList_Hover_SelectionBackground);
--_ui5_daypicker_item_now_box_shadow: inset 0 0 0 0.35rem var(--sapList_Background);
--_ui5_daypicker_item_selected_text_outline: 0.0625rem solid var(--sapSelectedColor);
--_ui5_daypicker_item_now_selected_outline_offset: -0.25rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
--_ui5_daypicker_item_selected_between_text_background: transparent;
--_ui5_daypicker_item_selected_between_text_font: var(--sapFontFamily);
--_ui5_daypicker_item_selected_text_font: var(--sapFontBoldFamily);
--_ui5_daypicker_item_selected_between_hover_background: var(--sapList_Hover_SelectionBackground);
--_ui5_daypicker_item_now_box_shadow: inset 0 0 0 0.35rem var(--sapList_Background);
--_ui5_daypicker_item_selected_text_outline: 0.0625rem solid var(--sapSelectedColor);
--_ui5_daypicker_item_now_selected_outline_offset: -0.25rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
--_ui5_daypicker_item_selected_between_text_background: transparent;
--_ui5_daypicker_item_selected_between_text_font: var(--sapFontFamily);
--_ui5_daypicker_item_selected_text_font: var(--sapFontBoldFamily);
--_ui5_daypicker_item_selected_between_hover_background: var(--sapList_Hover_SelectionBackground);
--_ui5_daypicker_item_now_box_shadow: inset 0 0 0 0.35rem var(--sapList_Background);
--_ui5_daypicker_item_selected_text_outline: 0.0625rem solid var(--sapSelectedColor);
--_ui5_daypicker_item_now_selected_outline_offset: -0.25rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
--_ui5_daypicker_item_selected_between_text_background: transparent;
--_ui5_daypicker_item_selected_between_text_font: var(--sapFontFamily);
--_ui5_daypicker_item_selected_text_font: var(--sapFontBoldFamily);
--_ui5_daypicker_item_selected_between_hover_background: var(--sapList_Hover_SelectionBackground);
--_ui5_daypicker_item_now_box_shadow: inset 0 0 0 0.35rem var(--sapList_Background);
--_ui5_daypicker_item_selected_text_outline: 0.0625rem solid var(--sapSelectedColor);
--_ui5_daypicker_item_now_selected_outline_offset: -0.25rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
--_ui5_daypicker_item_selected_between_text_background: transparent;
--_ui5_daypicker_item_selected_between_text_font: var(--sapFontFamily);
--_ui5_daypicker_item_selected_text_font: var(--sapFontBoldFamily);
--_ui5_daypicker_item_selected_between_hover_background: var(--sapList_Hover_SelectionBackground);
--_ui5_daypicker_item_now_box_shadow: inset 0 0 0 0.35rem var(--sapList_Background);
--_ui5_daypicker_item_selected_text_outline: 0.0625rem solid var(--sapSelectedColor);
--_ui5_daypicker_item_now_selected_outline_offset: -0.25rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
--_ui5_daypicker_item_selected_between_text_background: transparent;
--_ui5_daypicker_item_selected_between_text_font: var(--sapFontFamily);
--_ui5_daypicker_item_selected_text_font: var(--sapFontBoldFamily);
--_ui5_daypicker_item_selected_between_hover_background: var(--sapList_Hover_SelectionBackground);
--_ui5_daypicker_item_now_box_shadow: inset 0 0 0 0.35rem var(--sapList_Background);
--_ui5_daypicker_item_selected_text_outline: 0.0625rem solid var(--sapSelectedColor);
--_ui5_daypicker_item_now_selected_outline_offset: -0.25rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
--_ui5_daypicker_item_selected_between_text_background: transparent;
--_ui5_daypicker_item_selected_between_text_font: var(--sapFontFamily);
--_ui5_daypicker_item_selected_text_font: var(--sapFontBoldFamily);
--_ui5_daypicker_item_selected_between_hover_background: var(--sapList_Hover_SelectionBackground);
--_ui5_daypicker_item_now_box_shadow: inset 0 0 0 0.35rem var(--sapList_Background);
--_ui5_daypicker_item_selected_text_outline: 0.0625rem solid var(--sapSelectedColor);
--_ui5_daypicker_item_now_selected_outline_offset: -0.25rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
--_ui5_daypicker_item_selected_between_text_background: transparent;
--_ui5_daypicker_item_selected_between_text_font: var(--sapFontFamily);
--_ui5_daypicker_item_selected_text_font: var(--sapFontBoldFamily);
--_ui5_daypicker_item_selected_between_hover_background: var(--sapList_Hover_SelectionBackground);
--_ui5_daypicker_item_now_box_shadow: inset 0 0 0 0.35rem var(--sapList_Background);
--_ui5_daypicker_item_selected_text_outline: 0.0625rem solid var(--sapSelectedColor);
--_ui5_daypicker_item_now_selected_outline_offset: -0.25rem;
Expand Down

0 comments on commit d4f0e0e

Please sign in to comment.