Skip to content

fix(ui5-avatar): make styles attribute dependant #1360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 26, 2020
Merged

fix(ui5-avatar): make styles attribute dependant #1360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions packages/main/src/themes/Avatar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,47 +95,47 @@
background-color: var(--sapAccentColor6);
}

:host([backgroundColor="Accent1"]) {
:host([background-color="Accent1"]) {
background-color: var(--sapAccentColor1);
}

:host([backgroundColor="Accent2"]) {
:host([background-color="Accent2"]) {
background-color: var(--sapAccentColor2);
}

:host([backgroundColor="Accent3"]) {
:host([background-color="Accent3"]) {
background-color: var(--sapAccentColor3);
}

:host([backgroundColor="Accent4"]) {
:host([background-color="Accent4"]) {
background-color: var(--sapAccentColor4);
}

:host([backgroundColor="Accent5"]) {
:host([background-color="Accent5"]) {
background-color: var(--sapAccentColor5);
}

:host([backgroundColor="Accent6"]) {
:host([background-color="Accent6"]) {
background-color: var(--sapAccentColor6);
}

:host([backgroundColor="Accent7"]) {
:host([background-color="Accent7"]) {
background-color: var(--sapAccentColor7);
}

:host([backgroundColor="Accent8"]) {
:host([background-color="Accent8"]) {
background-color: var(--sapAccentColor8);
}

:host([backgroundColor="Accent9"]) {
:host([background-color="Accent9"]) {
background-color: var(--sapAccentColor9);
}

:host([backgroundColor="Accent10"]) {
:host([background-color="Accent10"]) {
background-color: var(--sapAccentColor10);
}

:host([backgroundColor="Placeholder"]) {
:host([background-color="Placeholder"]) {
background-color: var(--sapContent_ImagePlaceholderBackground);
}

Expand Down
38 changes: 19 additions & 19 deletions packages/main/test/pages/Avatar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,31 +61,31 @@ <h3>Avatar - UI5 Icons</h3>

<section>
<h3>Avatar - Background colors [ Accent1, Accent2, Accent3, Accent4, Accent5, Accent6, Accent7, Accent8, Accent9, Accent10, Placeholder ]</h3>
<ui5-avatar backgroundColor="Accent1" size="L"></ui5-avatar>
<ui5-avatar backgroundColor="Accent2" size="L"></ui5-avatar>
<ui5-avatar backgroundColor="Accent3" size="L"></ui5-avatar>
<ui5-avatar backgroundColor="Accent4" size="L"></ui5-avatar>
<ui5-avatar backgroundColor="Accent5" size="L"></ui5-avatar>
<ui5-avatar background-color="Accent1" size="L"></ui5-avatar>
<ui5-avatar background-color="Accent2" size="L"></ui5-avatar>
<ui5-avatar background-color="Accent3" size="L"></ui5-avatar>
<ui5-avatar background-color="Accent4" size="L"></ui5-avatar>
<ui5-avatar background-color="Accent5" size="L"></ui5-avatar>
<ui5-avatar size="L"></ui5-avatar>
<ui5-avatar backgroundColor="Accent7" size="L"></ui5-avatar>
<ui5-avatar backgroundColor="Accent8" size="L"></ui5-avatar>
<ui5-avatar backgroundColor="Accent9" size="L"></ui5-avatar>
<ui5-avatar backgroundColor="Accent10" size="L"></ui5-avatar>
<ui5-avatar backgroundColor="Placeholder" size="L"></ui5-avatar>
<ui5-avatar background-color="Accent7" size="L"></ui5-avatar>
<ui5-avatar background-color="Accent8" size="L"></ui5-avatar>
<ui5-avatar background-color="Accent9" size="L"></ui5-avatar>
<ui5-avatar background-color="Accent10" size="L"></ui5-avatar>
<ui5-avatar background-color="Placeholder" size="L"></ui5-avatar>
</section>

<section>
<h3>Avatar - Initials</h3>
<ui5-avatar initials="XS" backgroundColor="Accent1" size="XS"></ui5-avatar>
<ui5-avatar initials="S" backgroundColor="Accent2" size="S"></ui5-avatar>
<ui5-avatar initials="M" backgroundColor="Accent3" size="M"></ui5-avatar>
<ui5-avatar initials="L" backgroundColor="Accent4" size="L"></ui5-avatar>
<ui5-avatar initials="XL" backgroundColor="Accent5" size="XL"></ui5-avatar>
<ui5-avatar initials="XS" background-color="Accent1" size="XS"></ui5-avatar>
<ui5-avatar initials="S" background-color="Accent2" size="S"></ui5-avatar>
<ui5-avatar initials="M" background-color="Accent3" size="M"></ui5-avatar>
<ui5-avatar initials="L" background-color="Accent4" size="L"></ui5-avatar>
<ui5-avatar initials="XL" background-color="Accent5" size="XL"></ui5-avatar>
<ui5-avatar initials="XS" shape="Square" size="XS"></ui5-avatar>
<ui5-avatar initials="S" backgroundColor="Accent7" shape="Square" size="S"></ui5-avatar>
<ui5-avatar initials="M" backgroundColor="Accent8" shape="Square" size="M"></ui5-avatar>
<ui5-avatar initials="L" backgroundColor="Accent9" shape="Square" size="L"></ui5-avatar>
<ui5-avatar initials="XL" backgroundColor="Accent10" shape="Square" size="XL"></ui5-avatar>
<ui5-avatar initials="S" background-color="Accent7" shape="Square" size="S"></ui5-avatar>
<ui5-avatar initials="M" background-color="Accent8" shape="Square" size="M"></ui5-avatar>
<ui5-avatar initials="L" background-color="Accent9" shape="Square" size="L"></ui5-avatar>
<ui5-avatar initials="XL" background-color="Accent10" shape="Square" size="XL"></ui5-avatar>
</section>

<section>
Expand Down
20 changes: 10 additions & 10 deletions packages/main/test/samples/Avatar.sample.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,18 @@ <h4>Avatar with UI5 Icons</h4>
<section>
<h4>Avatar with Initials</h4>
<div class="snippet">
<ui5-avatar initials="XS" backgroundColor="Accent1" size="XS"></ui5-avatar>
<ui5-avatar initials="S" backgroundColor="Accent2" size="S"></ui5-avatar>
<ui5-avatar initials="M" backgroundColor="Accent3" size="M"></ui5-avatar>
<ui5-avatar initials="L" backgroundColor="Accent4" size="L"></ui5-avatar>
<ui5-avatar initials="XL" backgroundColor="Accent5" size="XL"></ui5-avatar>
<ui5-avatar initials="XS" background-color="Accent1" size="XS"></ui5-avatar>
<ui5-avatar initials="S" background-color="Accent2" size="S"></ui5-avatar>
<ui5-avatar initials="M" background-color="Accent3" size="M"></ui5-avatar>
<ui5-avatar initials="L" background-color="Accent4" size="L"></ui5-avatar>
<ui5-avatar initials="XL" background-color="Accent5" size="XL"></ui5-avatar>
</div>
<pre class="prettyprint lang-html"><xmp>
<ui5-avatar initials="XS" backgroundColor="Accent1" size="XS"></ui5-avatar>
<ui5-avatar initials="S" backgroundColor="Accent2" size="S"></ui5-avatar>
<ui5-avatar initials="M" backgroundColor="Accent3" size="M"></ui5-avatar>
<ui5-avatar initials="L" backgroundColor="Accent4" size="L"></ui5-avatar>
<ui5-avatar initials="XL" backgroundColor="Accent5" size="XL"></ui5-avatar>
<ui5-avatar initials="XS" background-color="Accent1" size="XS"></ui5-avatar>
<ui5-avatar initials="S" background-color="Accent2" size="S"></ui5-avatar>
<ui5-avatar initials="M" background-color="Accent3" size="M"></ui5-avatar>
<ui5-avatar initials="L" background-color="Accent4" size="L"></ui5-avatar>
<ui5-avatar initials="XL" background-color="Accent5" size="XL"></ui5-avatar>
</xmp></pre>
</section>

Expand Down