Skip to content

Commit

Permalink
fix: resolve minor color theming issues #57
Browse files Browse the repository at this point in the history
  • Loading branch information
jordanjones243 authored and jason-capsule42 committed Sep 30, 2024
1 parent 16a4b0f commit 167aa4d
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 17 deletions.
2 changes: 1 addition & 1 deletion apiExamples/iconic.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<img src="https://picsum.photos/id/452/2800/2000.jpg" alt="">
</picture>
<span slot="icon">
<auro-icon category="social" name="instagram" customSize customColor style="color: var(--auro-color-base-white); width: 5rem"></auro-icon>
<auro-icon category="social" name="instagram" customSize customColor style="color: var(--ds-color-base-white); width: 5rem"></auro-icon>
</span>
<span slot="title">
<auro-header level="2" display="800" margin="both" size="none">Lorem ipsum title</auro-header>
Expand Down
8 changes: 4 additions & 4 deletions demo/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ The following example illustrates a `<auro-banner>` custom element with the `ico
<img src="https://picsum.photos/id/452/2800/2000.jpg" alt="">
</picture>
<span slot="icon">
<auro-icon category="social" name="instagram" customSize customColor style="color: var(--auro-color-base-white); width: 5rem"></auro-icon>
<auro-icon category="social" name="instagram" customSize customColor style="color: var(--ds-color-base-white); width: 5rem"></auro-icon>
</span>
<span slot="title">
<auro-header level="2" display="800" margin="both" size="none">Lorem ipsum title</auro-header>
Expand All @@ -354,7 +354,7 @@ The following example illustrates a `<auro-banner>` custom element with the `ico
<img src="https://picsum.photos/id/452/2800/2000.jpg" alt="">
</picture>
<span slot="icon">
<auro-icon category="social" name="instagram" customSize customColor style="color: var(--auro-color-base-white); width: 5rem"></auro-icon>
<auro-icon category="social" name="instagram" customSize customColor style="color: var(--ds-color-base-white); width: 5rem"></auro-icon>
</span>
<span slot="title">
<auro-header level="2" display="800" margin="both" size="none">Lorem ipsum title</auro-header>
Expand Down Expand Up @@ -556,8 +556,8 @@ The component may be restyled using the following code sample and changing the v
--ds-auro-banner-disclaimer-text-color: var(--ds-color-text-secondary-default, #{$ds-color-text-secondary-default});
--ds-auro-banner-title-text-color: var(--ds-color-text-emphasis-default, #{$ds-color-text-emphasis-default});
--ds-auro-banner-icon-container-color: var(--ds-color-utility-gray-default, #{$ds-color-utility-gray-default});
--ds-auro-banner-wrapper-container-color: var(--ds-color-brand-midnight-400, #{$ds-color-brand-midnight-400});
--ds-auro-banner-wrapper-border-color: var(--ds-color-brand-lounge, #{$ds-color-brand-lounge});
--ds-auro-banner-wrapper-container-color: var(--ds-color-container-secondary-inverse, #{$ds-color-container-secondary-inverse});
--ds-auro-banner-wrapper-border-color: var(--ds-color-border-secondary-default, #{$ds-color-border-secondary-default});
}
```
<!-- AURO-GENERATED-CONTENT:END -->
24 changes: 14 additions & 10 deletions src/color.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@
color: var(--ds-auro-banner-text-color);
}

:host([onDark]) {
@extend %auro-banner--ondark;
}

// =-=-=-=-= common styles -=-=-=-=-=-=
%auro-banner {
.disclaimer {
color: var(--ds-auro-banner-disclaimer-text-color);
Expand All @@ -30,14 +25,24 @@
}
}

// =-=-=-=-= ondark styles -=-=-=-=-=-=
%auro-banner--ondark {
--ds-auro-banner-text-color: var(--ds-color-text-primary-inverse, #{$ds-color-text-primary-inverse});
--ds-auro-banner-title-text-color: var(--ds-color-text-primary-inverse, #{$ds-color-text-primary-inverse});

.title {
--ds-auro-banner-title-text-color: var(--ds-color-text-primary-inverse, #{$ds-color-text-primary-inverse});

color: var(--ds-auro-banner-title-text-color);
}
}

// =-=-=-=-= billboard -=-=-=-=-=-=
:host([billboard]) {
:host([onDark]) {
@extend %auro-banner--ondark;
}


:host([billboard]),
:host([hero]),
:host([marquee]) {
@extend %auro-banner;
}

Expand All @@ -57,7 +62,6 @@
}
}

// =-=-=-=-= roundedBorder -=-=-=-=-=-=
:host([roundedBorder]),
:host([roundedBorder][alignLeft]) {
@extend %auro-banner;
Expand Down
4 changes: 2 additions & 2 deletions src/tokens.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
--ds-auro-banner-disclaimer-text-color: var(--ds-color-text-secondary-default, #{$ds-color-text-secondary-default});
--ds-auro-banner-title-text-color: var(--ds-color-text-emphasis-default, #{$ds-color-text-emphasis-default});
--ds-auro-banner-icon-container-color: var(--ds-color-utility-gray-default, #{$ds-color-utility-gray-default});
--ds-auro-banner-wrapper-container-color: var(--ds-color-brand-midnight-400, #{$ds-color-brand-midnight-400});
--ds-auro-banner-wrapper-border-color: var(--ds-color-brand-lounge, #{$ds-color-brand-lounge});
--ds-auro-banner-wrapper-container-color: var(--ds-color-container-secondary-inverse, #{$ds-color-container-secondary-inverse});
--ds-auro-banner-wrapper-border-color: var(--ds-color-border-secondary-default, #{$ds-color-border-secondary-default});
}

0 comments on commit 167aa4d

Please sign in to comment.