From 1dc151ed00d329494bf173bfec61a0b83f8af4b7 Mon Sep 17 00:00:00 2001 From: hinzzx Date: Fri, 25 Apr 2025 12:06:12 +0300 Subject: [PATCH] fix(ui5-button): update parameters according to VD --- packages/main/src/themes/Button.css | 8 ++++---- packages/main/src/themes/ButtonBadge.css | 4 ++-- packages/main/src/themes/base/Button-parameters.css | 2 +- .../main/src/themes/sap_horizon/Button-parameters.css | 2 +- .../src/themes/sap_horizon_dark/Button-parameters.css | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/main/src/themes/Button.css b/packages/main/src/themes/Button.css index 7f932702c7e5..de02125f2e2a 100644 --- a/packages/main/src/themes/Button.css +++ b/packages/main/src/themes/Button.css @@ -231,7 +231,7 @@ bdi { border-color: var(--sapButton_Emphasized_BorderColor); border-width: var(--_ui5_button_emphasized_border_width); color: var(--sapButton_Emphasized_TextColor); - font-family: var(--sapFontBoldFamily ); + font-family: var(--sapButton_Emphasized_FontFamily); } /*The ui5_hovered class is set by FileUploader to indicate hover state of the control*/ @@ -306,7 +306,7 @@ bdi { /* Button with badge */ ::slotted([slot="badge"][design="InlineText"]) { pointer-events: initial; - font-family: "72override", var(--sapFontFamily); + font-family: "72override", var(--sapButton_FontFamily); font-size: var(--sapFontSmallSize); padding-inline-start: 0.25rem; --_ui5-tag-height: 0.625rem; @@ -319,7 +319,7 @@ bdi { inset-inline-end: 0; margin: -0.5rem; z-index: 1000; - font-family: "72override", var(--sapFontFamily); + font-family: "72override", var(--sapButton_FontFamily); font-size: var(--sapFontSmallSize); --_ui5-tag-height: 0.625rem; } @@ -336,5 +336,5 @@ bdi { :host(:state(has-overlay-badge)) { overflow: visible; - margin-right: 5px; + margin-inline-end: 0.3125rem; } \ No newline at end of file diff --git a/packages/main/src/themes/ButtonBadge.css b/packages/main/src/themes/ButtonBadge.css index 00d6b6790b1a..c041334447ad 100644 --- a/packages/main/src/themes/ButtonBadge.css +++ b/packages/main/src/themes/ButtonBadge.css @@ -10,8 +10,8 @@ :host([design="AttentionDot"]) [ui5-tag]::part(root) { min-width: var(--_ui5-button-badge-diameter); - min-height: var(--_ui5-button-badge-diameter); - height: var(--_ui5-button-badge-diameter); + min-height: var(--_ui5-button-badge-diameter); + height: var(--_ui5-button-badge-diameter); width: var(--_ui5-button-badge-diameter); border-radius: 100%; } \ No newline at end of file diff --git a/packages/main/src/themes/base/Button-parameters.css b/packages/main/src/themes/base/Button-parameters.css index a2337f4c2e8a..361a3121a11a 100644 --- a/packages/main/src/themes/base/Button-parameters.css +++ b/packages/main/src/themes/base/Button-parameters.css @@ -17,7 +17,7 @@ --_ui5_button_focus_offset: 1px; --_ui5_button_focus_width: 1px; --_ui5_button_pressed_focused_border_color: var(--sapContent_ContrastFocusColor); - --_ui5_button_fontFamily: var(--sapFontFamily); + --_ui5_button_fontFamily: var(--sapButton_FontFamily); --_ui5_button_emphasized_focused_border_color: var(--sapButton_Emphasized_BorderColor); --_ui5_button_emphasized_focused_border_before: 0.125rem solid var(--sapContent_FocusColor); --_ui5_button_emphasized_focused_active_border_color: transparent; diff --git a/packages/main/src/themes/sap_horizon/Button-parameters.css b/packages/main/src/themes/sap_horizon/Button-parameters.css index e2f8b4ee5285..9501661c2ad8 100644 --- a/packages/main/src/themes/sap_horizon/Button-parameters.css +++ b/packages/main/src/themes/sap_horizon/Button-parameters.css @@ -12,6 +12,6 @@ --_ui5_button_text_shadow: none; --_ui5_button_emphasized_border_width: .0625rem; --_ui5_button_pressed_focused_border_color: var(--sapContent_FocusColor); - --_ui5_button_fontFamily: var(--sapFontSemiboldDuplexFamily); + --_ui5_button_fontFamily: var(--sapButton_FontFamily); --_ui5_button_emphasized_focused_border_color: var(--sapContent_ContrastFocusColor); } diff --git a/packages/main/src/themes/sap_horizon_dark/Button-parameters.css b/packages/main/src/themes/sap_horizon_dark/Button-parameters.css index 689f4d511f19..e820e7863c03 100644 --- a/packages/main/src/themes/sap_horizon_dark/Button-parameters.css +++ b/packages/main/src/themes/sap_horizon_dark/Button-parameters.css @@ -13,5 +13,5 @@ --_ui5_button_emphasized_border_width: .0625rem; --_ui5_button_pressed_focused_border_color: var(--sapContent_FocusColor); --_ui5_button_emphasized_focused_border_color: var(--sapContent_ContrastFocusColor); - --_ui5_button_fontFamily: var(--sapFontSemiboldDuplexFamily); + --_ui5_button_fontFamily: var(--sapButton_FontFamily); }