Skip to content

Commit f1e1343

Browse files
authored
fix(ui5-badge): fix icon size (#729)
1 parent 8d98def commit f1e1343

File tree

2 files changed

+34
-17
lines changed

2 files changed

+34
-17
lines changed

packages/main/src/themes/Badge.css

+33-17
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,42 @@
22

33
:host(:not([hidden])) {
44
display: inline-flex;
5-
height: 1.125rem;
6-
min-width: 1.125rem;
5+
height: 1.125em;
6+
min-width: 1.125em;
77
max-width: 100%;
8-
padding: 0 0.625rem;
8+
padding: 0 0.625em;
99
color: var(--sapUiBaseText);
1010
background: var(--ui5-badge-bg-color-scheme-1);
1111
border: solid 1px var(--ui5-badge-border-color-scheme-1);
12-
border-radius: 1.125rem;
12+
border-radius: 1.125em;
1313
box-sizing: border-box;
14-
font-size: var(--sapMFontSmallSize);
14+
font-size: var(--ui5-badge-font-size); /* origin from --sapMFontSmallSize (0.75rem) */
1515
font-family: var(--sapUiFontFamily);
1616
text-align: center;
1717
}
1818

1919
/* Bagde with Icon */
2020
:host([__has-icon]) {
21-
padding: 0 0.3125rem;
21+
padding: 0 0.3125em;
22+
}
23+
24+
::slotted(ui5-icon) {
25+
width: 0.75em;
26+
height: 0.75em;
27+
flex-shrink: 0;
28+
}
29+
30+
.ui5-badge-text {
31+
font-size: .75em;
2232
}
2333

2434
:host([__has-icon]) .ui5-badge-text {
25-
padding-left: 0.1875rem;
35+
padding-left: 0.1875em;
2636
}
2737

2838
/* RTL */
2939
:host([__has-icon]) .ui5-badge-root[rtl] .ui5-badge-text {
30-
padding-right: 0.1875rem;
40+
padding-right: 0.1875em;
3141
}
3242

3343
/* Scheme 1 */
@@ -103,38 +113,44 @@
103113
white-space: nowrap;
104114
text-overflow: ellipsis;
105115
text-transform: uppercase;
106-
letter-spacing: 0.0125rem;
116+
letter-spacing: 0.0125em;
107117
}
108118

109119
/* ================================== */
110120
/* ======= IE pair of styles ======== */
111121
/* ================================== */
112122
ui5-badge:not([hidden]) {
113123
display: inline-flex;
114-
height: 1.125rem;
115-
min-width: 1.125rem;
124+
height: 1.125em;
125+
min-width: 1.125em;
116126
max-width: 100%;
117-
padding: 0 0.625rem;
127+
padding: 0 0.625em;
118128
color: var(--sapUiBaseText);
119129
background: var(--ui5-badge-bg-color-scheme-1);
120130
border: solid 1px var(--ui5-badge-border-color-scheme-1);
121-
border-radius: 1.125rem;
131+
border-radius: 1.125em;
122132
box-sizing: border-box;
123-
font-size: var(--sapMFontSmallSize);
133+
font-size: var(--ui5-badge-font-size);
124134
font-family: var(--sapUiFontFamily);
125135
text-align: center;
126136
}
127137

128138
ui5-badge[__has-icon] {
129-
padding: 0 0.3125rem;
139+
padding: 0 0.3125em;
140+
}
141+
142+
ui5-badge ui5-icon {
143+
width: .75em;
144+
height: .75em;
145+
flex-shrink: 0;
130146
}
131147

132148
ui5-badge[__has-icon] .ui5-badge-text {
133-
padding-left: 0.1875rem;
149+
padding-left: 0.1875em;
134150
}
135151

136152
ui5-badge[__has-icon] .ui5-badge-root[rtl] .ui5-badge-text {
137-
padding-right: 0.1875rem;
153+
padding-right: 0.1875em;
138154
}
139155

140156
/* Scheme 1 */

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

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
:root {
2+
--ui5-badge-font-size: 0.75em; /* origin from --sapMFontSmallSize (0.75rem) */
23
--ui5-badge-bg-color-scheme-1: var(--sapUiAccent1Lighten50);
34
--ui5-badge-border-color-scheme-1: var(--sapUiAccent1);
45
--ui5-badge-bg-color-scheme-2: var(--sapUiAccent2Lighten40);

0 commit comments

Comments
 (0)