Skip to content

Commit

Permalink
fix(ui5-button): correct focus outline colors in active/focus state (#…
Browse files Browse the repository at this point in the history
…8325)

fix(ui5-button): correct border colors in active/focus state
  • Loading branch information
hinzzx authored Feb 26, 2024
1 parent 8412414 commit 32385a7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion packages/main/src/themes/Button.css
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,9 @@
pointer-events: none;
}

:host([focused]) .ui5-button-root:after {
:host([focused]:not([active])) .ui5-button-root:after,
:host([focused][active][design="Emphasized"]) .ui5-button-root:after,
:host([focused][active]) .ui5-button-root:before {
content: "";
position: absolute;
box-sizing: border-box;
Expand All @@ -122,6 +124,10 @@
border-radius: var(--_ui5_button_focused_border_radius);
}

:host([focused][active]) .ui5-button-root:before {
border-color: var(--_ui5_button_pressed_focused_border_color);
}

:host([design="Emphasized"][focused]) .ui5-button-root:after {
border-color: var(--_ui5_button_emphasized_focused_border_color);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/themes/base/Button-parameters.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
--_ui5_button_pressed_focused_border_color: var(--sapContent_ContrastFocusColor);
--_ui5_button_fontFamily: var(--sapFontFamily);
--_ui5_button_emphasized_focused_border_color: var(--sapButton_Emphasized_BorderColor);
--_ui5_button_emphasized_focused_border_before: none;
--_ui5_button_emphasized_focused_border_before: 0.125rem solid var(--sapContent_FocusColor);
--_ui5_button_emphasized_focused_active_border_color: transparent;
}

0 comments on commit 32385a7

Please sign in to comment.