Skip to content

Suggested mixin updates #374

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
chrisdo1 merged 7 commits into from
Mar 22, 2019
Merged

Suggested mixin updates #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f10cdee
Suggested mixin updates
Mar 22, 2019
cb62306
Updates to the styles to resolve compilation error
Mar 22, 2019
5921d31
Merge branch 'set-accordion-placeholders' into set-accordion-placehol…
castastrophe Mar 22, 2019
8cbf1e8
Revert accidental merge conflict overwrites
Mar 22, 2019
7544220
Resolve complexity with variable calls in mixins using pfe-local; fix…
Mar 22, 2019
0528246
Remove unnecessary comments
Mar 22, 2019
b1059e3
minor syntax updates
Mar 22, 2019
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
12 changes: 12 additions & 0 deletions elements/pfe-accordion/demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@
section {
padding: 2rem;
}
a {
color: var(--pfe-broadcasted--color--ui-link);
}
a:hover {
color: var(--pfe-broadcasted--color--ui-link--hover);
}
a:visited {
color: var(--pfe-broadcasted--color--ui-link--visited);
}
a:focus {
color: var(--pfe-broadcasted--color--ui-link--focus);
}
.dark-background {
background-color: #191e84;
}
Expand Down
78 changes: 14 additions & 64 deletions elements/pfe-accordion/src/pfe-accordion-header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@import "../../pfe-sass/pfe-sass";

$LOCAL: accordion;

/// ===========================================================================
/// DEFAULT ACCORDION HEADING
/// ===========================================================================
Expand All @@ -8,52 +10,24 @@
@include pfe-accordion-header;

button {
@include pfe-trigger-button($type: accordion); // border 3px
@include pfe-trigger-color-light($type: accordion);
@include pfe-trigger-color($component-name: accordion);
@include pfe-trigger-button;

&[aria-expanded="true"] {
@include pfe-trigger-color-light-expanded($type: accordion);
@include pfe-trigger-expanded;
}

&[aria-expanded="true"]::after {
@include pfe-chevron-expanded-true;
@include pfe-trigger-color-expanded($component-name: accordion);
@include pfe-trigger-expanded;
&::after {
@include pfe-chevron-expanded;
}
}

&[aria-expanded="false"]::after {
@include pfe-chevron-expanded-false;
@include pfe-chevron-expanded($state: false);
}
}
}

////////// last child

// @TODO: add lighter/lightest and darker/darkest colors.

// :host([color="darker"]:last-of-type),
// :host([color="darkest"]:last-of-type) {
// button[aria-expanded="false"] {
// @include pfe-trigger-button-last($theme: dark);
// }
// }

// :host([color="lighter"]:last-of-type),
// :host([color="lightest"]:last-of-type) {
// button[aria-expanded="false"] {
// @include pfe-trigger-button-last($theme: light);
// }
// }

// :host([color="darker"]:first-child),
// :host([color="darkest"]:first-child) {
// button {
// @include pfe-trigger-button-first($theme: dark);
// }
// }

:host(:first-child),
:host([color="lighter"]:first-child),
:host([color="lightest"]:first-child) {
:host(:first-child) {
button {
@include pfe-trigger-button-first($theme: light);
}
Expand All @@ -72,39 +46,15 @@
}

/// ===========================================================================
/// COLOR OVERRIDES
/// CONTEXT STYLES, ON=DARK
/// ===========================================================================

:host([on="dark"]) {
button {
@include pfe-trigger-color-dark($type: accordion);
@include pfe-trigger-color($theme: dark, $component-name: accordion);

&[aria-expanded="true"] {
@include pfe-trigger-color-dark-expanded($type: accordion);
@include pfe-trigger-color-expanded($theme: dark, $component-name: accordion);
}
}
}

// @TODO: add lighter/lightest and darker/darkest colors.

// :host([color="lighter"]),
// :host([color="lightest"]) {
// button {
// @include pfe-trigger-color-lightest;

// &[aria-expanded="true"] {
// @include pfe-trigger-color-light-expanded;
// }
// }
// }

// :host([color="darker"]),
// :host([color="darkest"]) {
// button {
// @include pfe-trigger-color-darkest;

// &[aria-expanded="true"] {
// @include pfe-trigger-color-darkest-expanded;
// }
// }
// }
26 changes: 5 additions & 21 deletions elements/pfe-accordion/src/pfe-accordion-panel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@import "../../pfe-sass/pfe-sass";

$LOCAL: accordion;

/// ===========================================================================
/// DEFAULT ACCORDION PANEL
/// ===========================================================================
Expand All @@ -14,6 +16,7 @@
}

:host([on="dark"][expanded]) {
@include pfe-theme($theme: "dark");
@include pfe-accordion-panel-expanded-style($theme: dark);
}

Expand All @@ -25,27 +28,8 @@
.container {
@include pfe-accordion-panel-container-inset($align: left);
}

:host(:last-of-type[expanded]) {
@include pfe-accordion-panel-expanded-last;
margin-bottom: 0;
}

// @TODO: add lighter/lightest and darker/darkest colors.

// :host([color="lighter"][expanded]),
// :host([color="lightest"][expanded]) {
// @include pfe-accordion-panel-expanded-style;
// @include pfe-accordion-panel-expanded-style-lightest;
// }

// :host([color="darker"][expanded]),
// :host([color="darkest"][expanded]) {
// @include pfe-accordion-panel-expanded-style($theme: dark);
// @include pfe-accordion-panel-expanded-style-darkest;
// }

// :host(:last-of-type[color="darker"][expanded]),
// :host(:last-of-type[color="darkest"][expanded]) {
// @include pfe-accordion-panel-expanded-last-dark;
// }

20 changes: 3 additions & 17 deletions elements/pfe-accordion/src/pfe-accordion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
@import "../../pfe-sass/pfe-sass";

$LOCAL: accordion;

:host {
display: block;
position: relative;
overflow: hidden;
margin: 0;
color: var(--pfe-broadcasted--color--text);
color: #{pfe-radio(color--text)};
}

:host([on="dark"]) {
Expand All @@ -16,19 +18,3 @@
@include pfe-theme($theme: "light");
}

// @TODO: add lighter/lightest and darker/darkest colors.

// :host([color="darker"]) {
// @include pfe-theme($theme: "darker");
// }
// :host([color="darkest"]) {
// @include pfe-theme($theme: "darkest");
// }

// :host([color="lighter"]) {
// @include pfe-theme($theme: "lighter");
// }
// :host([color="lightest"]) {
// @include pfe-theme($theme: "lightest");
// }

Loading