Skip to content

fix: cta styling removing color context provider #2005

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

Closed
zeroedin wants to merge 2 commits into from
Closed

fix: cta styling removing color context provider #2005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6d3669
fix(cta): remove color context provider
zeroedin Apr 18, 2022
e8bef3b
chore(cta): add changeset
zeroedin Apr 18, 2022
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
5 changes: 5 additions & 0 deletions .changeset/wet-masks-hear.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@patternfly/pfe-cta": patch
---

Removes color context provider, reverting back to color attribute
86 changes: 43 additions & 43 deletions elements/pfe-cta/demo/pfe-cta.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,24 @@ <h3 slot="header">No color-palette attribute</h3>
<div class="event-registry" slot="footer"></div>
</pfe-card>
<pfe-card color-palette="lightest" size="small">
<h3 slot="header"><code>color-palette="base"</code></h3>
<h3 slot="header"><code>color="base"</code></h3>
<div class="cta-align">
<pfe-cta color-palette="base"><a href="#default">Default</a></pfe-cta>
<pfe-cta priority="primary" color-palette="base"><a href="#primary">Primary</a></pfe-cta>
<pfe-cta priority="secondary" color-palette="base"><a href="#secondary">Secondary</a></pfe-cta>
<pfe-cta priority="secondary" color-palette="base" variant="wind"><a href="#secondary-wind">Secondary + wind variant</a></pfe-cta>
<pfe-cta aria-disabled="true" color-palette="base"><a href="#disabled" disabled>Disabled</a></pfe-cta>
<pfe-cta color="base"><a href="#default">Default</a></pfe-cta>
<pfe-cta priority="primary" color="base"><a href="#primary">Primary</a></pfe-cta>
<pfe-cta priority="secondary" color="base"><a href="#secondary">Secondary</a></pfe-cta>
<pfe-cta priority="secondary" color="base" variant="wind"><a href="#secondary-wind">Secondary + wind variant</a></pfe-cta>
<pfe-cta aria-disabled="true" color="base"><a href="#disabled" disabled>Disabled</a></pfe-cta>
</div>
<div class="event-registry" slot="footer"></div>
</pfe-card>
<pfe-card color-palette="lightest" size="small">
<h3 slot="header"><code>color-palette="accent"</code></h3>
<h3 slot="header"><code>color="accent"</code></h3>
<div class="cta-align">
<pfe-cta color-palette="accent"><a href="#default">Default</a></pfe-cta>
<pfe-cta priority="primary" color-palette="accent"><a href="#primary">Primary</a></pfe-cta>
<pfe-cta priority="secondary" color-palette="accent"><a href="#secondary">Secondary</a></pfe-cta>
<pfe-cta priority="secondary" color-palette="accent" variant="wind"><a href="#secondary-wind">Secondary + wind variant</a></pfe-cta>
<pfe-cta aria-disabled="true" color-palette="accent"><a href="#disabled" disabled>Disabled</a></pfe-cta>
<pfe-cta color="accent"><a href="#default">Default</a></pfe-cta>
<pfe-cta priority="primary" color="accent"><a href="#primary">Primary</a></pfe-cta>
<pfe-cta priority="secondary" color="accent"><a href="#secondary">Secondary</a></pfe-cta>
<pfe-cta priority="secondary" color="accent" variant="wind"><a href="#secondary-wind">Secondary + wind variant</a></pfe-cta>
<pfe-cta aria-disabled="true" color="accent"><a href="#disabled" disabled>Disabled</a></pfe-cta>
</div>
<div class="event-registry" slot="footer"></div>
</pfe-card>
Expand All @@ -65,25 +65,25 @@ <h3 slot="header">No color-palette attribute</h3>
<div class="event-registry" slot="footer"></div>
</pfe-card>
<pfe-card color-palette="darkest" size="small">
<h3 slot="header"><code>color-palette="base"</code></h3>
<h3 slot="header"><code>color="base"</code></h3>
<div class="cta-align">
<pfe-cta color-palette="base"><a href="#default">Default</a></pfe-cta>
<pfe-cta priority="primary" color-palette="base"><a href="#primary">Primary</a></pfe-cta>
<pfe-cta priority="secondary" color-palette="base"><a href="#secondary">Secondary</a></pfe-cta>
<pfe-cta priority="secondary" color-palette="base" variant="wind"><a href="#secondary-wind">Secondary + wind variant</a></pfe-cta>
<pfe-cta aria-disabled="true" color-palette="base"><a href="#disabled" disabled>Disabled</a>
<pfe-cta color="base"><a href="#default">Default</a></pfe-cta>
<pfe-cta priority="primary" color="base"><a href="#primary">Primary</a></pfe-cta>
<pfe-cta priority="secondary" color="base"><a href="#secondary">Secondary</a></pfe-cta>
<pfe-cta priority="secondary" color="base" variant="wind"><a href="#secondary-wind">Secondary + wind variant</a></pfe-cta>
<pfe-cta aria-disabled="true" color="base"><a href="#disabled" disabled>Disabled</a>
</pfe-cta>
</div>
<div class="event-registry" slot="footer"></div>
</pfe-card>
<pfe-card color-palette="darkest" size="small">
<h3 slot="header"><code>color-palette="accent"</code></h3>
<h3 slot="header"><code>color="accent"</code></h3>
<div class="cta-align">
<pfe-cta color-palette="accent"><a href="#default">Default</a></pfe-cta>
<pfe-cta priority="primary" color-palette="accent"><a href="#primary">Primary</a></pfe-cta>
<pfe-cta priority="secondary" color-palette="accent"><a href="#secondary">Secondary</a></pfe-cta>
<pfe-cta priority="secondary" color-palette="accent" variant="wind"><a href="#secondary-wind">Secondary + wind variant</a></pfe-cta>
<pfe-cta aria-disabled="true" color-palette="accent"><a href="#disabled" disabled>Disabled</a>
<pfe-cta color="accent"><a href="#default">Default</a></pfe-cta>
<pfe-cta priority="primary" color="accent"><a href="#primary">Primary</a></pfe-cta>
<pfe-cta priority="secondary" color="accent"><a href="#secondary">Secondary</a></pfe-cta>
<pfe-cta priority="secondary" color="accent" variant="wind"><a href="#secondary-wind">Secondary + wind variant</a></pfe-cta>
<pfe-cta aria-disabled="true" color="accent"><a href="#disabled" disabled>Disabled</a>
</pfe-cta>
</div>
<div class="event-registry" slot="footer"></div>
Expand All @@ -107,24 +107,24 @@ <h3 slot="header">No color-palette attribute</h3>
<div class="event-registry" slot="footer"></div>
</pfe-card>
<pfe-card color-palette="complement" size="small">
<h3 slot="header"><code>color-palette="base"</code></h3>
<h3 slot="header"><code>color="base"</code></h3>
<div class="cta-align">
<pfe-cta color-palette="base"><a href="#default">Default</a></pfe-cta>
<pfe-cta priority="primary" color-palette="base"><a href="#primary">Primary</a></pfe-cta>
<pfe-cta priority="secondary" color-palette="base"><a href="#secondary">Secondary</a></pfe-cta>
<pfe-cta priority="secondary" color-palette="base" variant="wind"><a href="#secondary-wind">Secondary + wind variant</a></pfe-cta>
<pfe-cta aria-disabled="true" color-palette="base"><a href="#disabled" disabled>Disabled</a></pfe-cta>
<pfe-cta color="base"><a href="#default">Default</a></pfe-cta>
<pfe-cta priority="primary" color="base"><a href="#primary">Primary</a></pfe-cta>
<pfe-cta priority="secondary" color="base"><a href="#secondary">Secondary</a></pfe-cta>
<pfe-cta priority="secondary" color="base" variant="wind"><a href="#secondary-wind">Secondary + wind variant</a></pfe-cta>
<pfe-cta aria-disabled="true" color="base"><a href="#disabled" disabled>Disabled</a></pfe-cta>
</div>
<div class="event-registry" slot="footer"></div>
</pfe-card>
<pfe-card color-palette="complement" size="small">
<h3 slot="header"><code>color-palette="accent"</code></h3>
<h3 slot="header"><code>color="accent"</code></h3>
<div class="cta-align">
<pfe-cta color-palette="accent"><a href="#default">Default</a></pfe-cta>
<pfe-cta priority="primary" color-palette="accent"><a href="#primary">Primary</a></pfe-cta>
<pfe-cta priority="secondary" color-palette="accent"><a href="#secondary">Secondary</a></pfe-cta>
<pfe-cta priority="secondary" color-palette="accent" variant="wind"><a href="#secondary-wind">Secondary + wind variant</a></pfe-cta>
<pfe-cta aria-disabled="true" color-palette="accent"><a href="#disabled" disabled>Disabled</a>/pfe-cta>
<pfe-cta color="accent"><a href="#default">Default</a></pfe-cta>
<pfe-cta priority="primary" color="accent"><a href="#primary">Primary</a></pfe-cta>
<pfe-cta priority="secondary" color="accent"><a href="#secondary">Secondary</a></pfe-cta>
<pfe-cta priority="secondary" color="accent" variant="wind"><a href="#secondary-wind">Secondary + wind variant</a></pfe-cta>
<pfe-cta aria-disabled="true" color="accent"><a href="#disabled" disabled>Disabled</a>/pfe-cta>
</div>
<div class="event-registry" slot="footer"></div>
</pfe-card>
Expand Down Expand Up @@ -173,8 +173,8 @@ <h4 style="color:white;">Color responsive</h4>

<h4 style="color:white;">Color override</h4>
<div class="cta-layout">
<pfe-cta priority="primary" color-palette="accent"><a href="#primary">Primary accent</a></pfe-cta>
<pfe-cta priority="secondary" color-palette="accent"><a href="#secondary">Secondary accent</a></pfe-cta>
<pfe-cta priority="primary" color="accent"><a href="#primary">Primary accent</a></pfe-cta>
<pfe-cta priority="secondary" color="accent"><a href="#secondary">Secondary accent</a></pfe-cta>
<pfe-cta priority="primary" color-palette="lightest"><a href="#primary">Primary lightest</a></pfe-cta>
<pfe-cta priority="secondary" variant="wind"><a href="#secondary-wind">Secondary + wind variant</a></pfe-cta>
</div>
Expand All @@ -196,11 +196,11 @@ <h4 style="color: white">Color responsive</h4>

<h4 style="color: white">Color override</h4>
<div class="card-layout">
<pfe-cta priority="primary" color-palette="accent"><a href="#primary">Primary accent</a></pfe-cta>
<pfe-cta priority="secondary" color-palette="accent"><a href="#secondary">Secondary accent</a></pfe-cta>
<pfe-cta priority="primary" color-palette="complement"><a href="#primary">Primary complement</a></pfe-cta>
<pfe-cta priority="secondary" color-palette="complement"><a href="#secondary">Secondary complement</a></pfe-cta>
<pfe-cta priority="primary" color-palette="lightest"><a href="#primary">Primary lightest</a></pfe-cta>
<pfe-cta priority="primary" color="accent"><a href="#primary">Primary accent</a></pfe-cta>
<pfe-cta priority="secondary" color="accent"><a href="#secondary">Secondary accent</a></pfe-cta>
<pfe-cta priority="primary" color="complement"><a href="#primary">Primary complement</a></pfe-cta>
<pfe-cta priority="secondary" color="complement"><a href="#secondary">Secondary complement</a></pfe-cta>
<pfe-cta priority="primary" color="lightest"><a href="#primary">Primary lightest</a></pfe-cta>
<pfe-cta priority="secondary" variant="wind"><a href="#secondary-wind">Secondary + wind variant</a></pfe-cta>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions elements/pfe-cta/pfe-cta.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,19 +159,19 @@

// Primary omitted because it already uses the accent color

:host([priority="secondary"][color-palette="accent"]) {
:host([priority="secondary"][color="accent"]) {
@include pfe-print-local($secondary-accent);
}

/// ===========================================================================
/// COLOR=BASE
/// ===========================================================================

:host([priority="primary"][color-palette="base"]) {
:host([priority="primary"][color="base"]) {
@include pfe-print-local($primary-base);
}

:host([priority="secondary"][color-palette="base"]) {
:host([priority="secondary"][color="base"]) {
@include pfe-print-local($secondary-base);
}

Expand Down
16 changes: 2 additions & 14 deletions elements/pfe-cta/pfe-cta.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import { Logger } from '@patternfly/pfe-core/controllers/logger.js';
import {
bound,
colorContextConsumer,
colorContextProvider,
deprecation,
initializer,
pfelement,
} from '@patternfly/pfe-core/decorators.js';
Expand Down Expand Up @@ -96,24 +94,14 @@ export class PfeCta extends LitElement {
*/
@property({ reflect: true }) priority?: 'primary'|'secondary';

/**
* Sets color palette, which affects the element's styles as well as descendants' color theme.
* Overrides parent color context.
* Your theme will influence these colors so check there first if you are seeing inconsistencies.
* See [CSS Custom Properties](#css-custom-properties) for default values
*/
@colorContextProvider()
@property({ reflect: true, attribute: 'color-palette' }) colorPalette?: ColorPalette;

/** @deprecated use `color-palette` */
@deprecation({ alias: 'colorPalette', attribute: 'color' }) color?: ColorPalette;

/**
* Sets color theme based on parent context
*/
@colorContextConsumer()
@property({ reflect: true }) on?: ColorTheme;

@property({ reflect: true, attribute: 'color' }) color?: 'accent' | 'base' | null;

/**
* `priority="secondary"` has a `wind` variant (`variant="wind"`) that can be applied to change the style of the secondary call-to-action.
*
Expand Down