Skip to content

Commit 20511c6

Browse files
authored
fix(ui5-button): prevents setting 0 height to icons on IE (#902)
1 parent a141cb9 commit 20511c6

File tree

2 files changed

+57
-1
lines changed

2 files changed

+57
-1
lines changed

packages/main/src/themes/Button.css

+6-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
background: var(--sapUiButtonHoverBackground);
7070
}
7171

72-
.ui5-button-root .ui5-button-icon {
72+
.ui5-button-icon {
7373
font-size: var(--_ui5_button_base_icon_only_font_size);
7474
height: 0;
7575
top: -.5rem;
@@ -281,3 +281,8 @@ ui5-button[design="Negative"][active][focused] .ui5-button-root::after {
281281
ui5-button[design="Emphasized"][focused] .ui5-button-root::after {
282282
border-color: var(--sapUiContentContrastFocusColor);
283283
}
284+
285+
ui5-button ui5-icon.ui5-button-icon {
286+
height: 1rem;
287+
top: 0;
288+
}

packages/main/src/themes/ToggleButton.css

+51
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,54 @@
5353
:host([pressed]:hover) {
5454
background: var(--sapUiToggleButtonPressedHoverBackground);
5555
}
56+
57+
/* IE Specific CSS, duplicate it for ToggleButton */
58+
59+
ui5-togglebutton[focused] {
60+
outline: none;
61+
}
62+
63+
ui5-togglebutton[focused] .ui5-button-root {
64+
position: relative;
65+
}
66+
67+
ui5-togglebutton[focused] .ui5-button-root::after {
68+
content: "";
69+
position: absolute;
70+
border-width: 1px;
71+
border-style: dotted;
72+
border-color: var(--_ui5_button_focus_color);
73+
top: var(--_ui5_button_focus_offset);
74+
bottom: var(--_ui5_button_focus_offset);
75+
left: var(--_ui5_button_focus_offset);
76+
right: var(--_ui5_button_focus_offset);
77+
}
78+
79+
ui5-togglebutton[active] .ui5-button-root::after {
80+
border-color: var(--sapUiContentContrastFocusColor);
81+
}
82+
83+
ui5-togglebutton[design="Positive"][focused] .ui5-button-root::after {
84+
border-color: var(--_ui5_button_positive_border_focus_hover_color);
85+
}
86+
87+
ui5-togglebutton[design="Positive"][active][focused] .ui5-button-root::after {
88+
border-color: var(--sapUiContentContrastFocusColor);
89+
}
90+
91+
ui5-togglebutton[design="Negative"][focused] .ui5-button-root::after {
92+
border-color: var(--_ui5_button_positive_border_focus_hover_color);
93+
}
94+
95+
ui5-togglebutton[design="Negative"][active][focused] .ui5-button-root::after {
96+
border-color: var(--sapUiContentContrastFocusColor);
97+
}
98+
99+
ui5-togglebutton[design="Emphasized"][focused] .ui5-button-root::after {
100+
border-color: var(--sapUiContentContrastFocusColor);
101+
}
102+
103+
ui5-togglebutton ui5-icon.ui5-button-icon {
104+
height: 1rem;
105+
top: 0;
106+
}

0 commit comments

Comments
 (0)