Skip to content

Commit ea8ef59

Browse files
author
PetyaMarkovaBogdanova
authored
fix(ui5-avatar): Fixed font-size and color-scheme (#3799)
1 parent 5ce5948 commit ea8ef59

File tree

10 files changed

+60
-15
lines changed

10 files changed

+60
-15
lines changed

packages/main/src/themes/Avatar.css

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,35 +48,35 @@
4848
width: 2rem;
4949
min-height: 2rem;
5050
min-width: 2rem;
51-
font-size: .75rem;
51+
font-size: var(--_ui5_avatar_fontsize_XS);
5252
}
5353

5454
:host([_size="S"]),
5555
:host([size="S"]) {
5656
min-height: 3rem;
5757
min-width: 3rem;
58-
font-size: 1.125rem;
58+
font-size: var(--_ui5_avatar_fontsize_S);
5959
}
6060

6161
:host([_size="M"]),
6262
:host([size="M"]) {
6363
min-height: 4rem;
6464
min-width: 4rem;
65-
font-size: 1.625rem;
65+
font-size: var(--_ui5_avatar_fontsize_M);
6666
}
6767

6868
:host([_size="L"]),
6969
:host([size="L"]) {
7070
min-height: 5rem;
7171
min-width: 5rem;
72-
font-size: 2rem;
72+
font-size: var(--_ui5_avatar_fontsize_L);
7373
}
7474

7575
:host([_size="XL"]),
7676
:host([size="XL"]) {
7777
min-height: 7rem;
7878
min-width: 7rem;
79-
font-size: 2.75rem;
79+
font-size: var(--_ui5_avatar_fontsize_XL);
8080
}
8181

8282
/* Icon */
@@ -122,6 +122,13 @@
122122
height: 100%;
123123
}
124124

125+
:host(:not([color-scheme])),
126+
:host(:not([_has-image])),
127+
:host([_color-scheme="Accent6"]),
128+
:host([color-scheme="Accent6"]) {
129+
background-color: var(--ui5-avatar-accent6);
130+
}
131+
125132
:host([_color-scheme="Accent1"]),
126133
:host([color-scheme="Accent1"]) {
127134
background-color: var(--ui5-avatar-accent1);
@@ -147,12 +154,6 @@
147154
background-color: var(--ui5-avatar-accent5);
148155
}
149156

150-
:host(:not([color-scheme]):not([_has-image])),
151-
:host([_color-scheme="Accent6"]),
152-
:host([color-scheme="Accent6"]) {
153-
background-color: var(--ui5-avatar-accent6);
154-
}
155-
156157
:host([_color-scheme="Accent7"]),
157158
:host([color-scheme="Accent7"]) {
158159
background-color: var(--ui5-avatar-accent7);

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,10 @@
1717
--_ui5_avatar_focus_offset: 1px;
1818
--_ui5_avatar_focus_width: 1px;
1919
--_ui5_avatar_focus_color: var(--sapContent_FocusColor);
20+
21+
--_ui5_avatar_fontsize_XS: 0.75rem;
22+
--_ui5_avatar_fontsize_S: 1.125rem;
23+
--_ui5_avatar_fontsize_M: 1.625rem;
24+
--_ui5_avatar_fontsize_L: 2rem;
25+
--_ui5_avatar_fontsize_XL: 2.75rem;
2026
}

packages/main/src/themes/sap_belize_hcb/Avatar-parameters.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import "../base/Avatar-parameters.css";
2+
13
:root {
24
--ui5-avatar-initials-color: #fff;
35
--ui5-avatar-initials-border: .0625rem solid #fff;

packages/main/src/themes/sap_belize_hcw/Avatar-parameters.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import "../base/Avatar-parameters.css";
2+
13
:root {
24
--ui5-avatar-initials-color: #000;
35
--ui5-avatar-initials-border: .0625rem solid #000;
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@import "../base/Avatar-parameters.css";
2+
3+
:root {
4+
--_ui5_avatar_fontsize_XS: 1rem;
5+
--_ui5_avatar_fontsize_S: 1.125rem;
6+
--_ui5_avatar_fontsize_M: 1.5rem;
7+
--_ui5_avatar_fontsize_L: 2.25rem;
8+
--_ui5_avatar_fontsize_XL: 3rem;
9+
}

packages/main/src/themes/sap_fiori_3/parameters-bundle.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@import "../base/sizes-parameters.css";
2-
@import "../base/Avatar-parameters.css";
2+
@import "./Avatar-parameters.css";
33
@import "../base/Badge-parameters.css";
44
@import "./Button-parameters.css";
55
@import "../base/Card-parameters.css";
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@import "../base/Avatar-parameters.css";
2+
3+
:root {
4+
--_ui5_avatar_fontsize_XS: 1rem;
5+
--_ui5_avatar_fontsize_S: 1.125rem;
6+
--_ui5_avatar_fontsize_M: 1.5rem;
7+
--_ui5_avatar_fontsize_L: 2.25rem;
8+
--_ui5_avatar_fontsize_XL: 3rem;
9+
}

packages/main/src/themes/sap_fiori_3_dark/parameters-bundle.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@import "../base/sizes-parameters.css";
2-
@import "../base/Avatar-parameters.css";
2+
@import "./Avatar-parameters.css";
33
@import "../base/Badge-parameters.css";
44
@import "./Button-parameters.css";
55
@import "../base/Card-parameters.css";

packages/main/src/themes/sap_fiori_3_hcb/Avatar-parameters.css

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import "../base/Avatar-parameters.css";
2+
13
:root {
24
--ui5-avatar-initials-color: var(--sapTextColor);
35
--ui5-avatar-initials-border: .0625rem solid var(--sapField_BorderColor);
@@ -13,4 +15,10 @@
1315
--ui5-avatar-accent10: var(--sapBackgroundColor);
1416
--ui5-avatar-placeholder: var(--sapBackgroundColor);
1517
--_ui5_avatar_outline: 0.125rem dotted var(--sapContent_FocusColor);
16-
}
18+
19+
--_ui5_avatar_fontsize_XS: 1rem;
20+
--_ui5_avatar_fontsize_S: 1.125rem;
21+
--_ui5_avatar_fontsize_M: 1.5rem;
22+
--_ui5_avatar_fontsize_L: 2.25rem;
23+
--_ui5_avatar_fontsize_XL: 3rem;
24+
}

packages/main/src/themes/sap_fiori_3_hcw/Avatar-parameters.css

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import "../base/Avatar-parameters.css";
2+
13
:root {
24
--ui5-avatar-initials-color: var(--sapTextColor);
35
--ui5-avatar-initials-border: .0625rem solid var(--sapField_BorderColor);
@@ -13,4 +15,10 @@
1315
--ui5-avatar-accent10: var(--sapBackgroundColor);
1416
--ui5-avatar-placeholder: var(--sapBackgroundColor);
1517
--_ui5_avatar_outline: 0.125rem dotted var(--sapContent_FocusColor);
16-
}
18+
19+
--_ui5_avatar_fontsize_XS: 1rem;
20+
--_ui5_avatar_fontsize_S: 1.125rem;
21+
--_ui5_avatar_fontsize_M: 1.5rem;
22+
--_ui5_avatar_fontsize_L: 2.25rem;
23+
--_ui5_avatar_fontsize_XL: 3rem;
24+
}

0 commit comments

Comments
 (0)