Skip to content

Cleanup component level custom properties #4768

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 5 commits into from
Dec 1, 2021
Merged

Cleanup component level custom properties #4768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e598ee
Cleanup component level custom properties
kyledurand Nov 30, 2021
98a6158
Update src/components/ActionList/ActionList.scss
kyledurand Nov 30, 2021
217fcd3
--pc-color-picker
kyledurand Dec 1, 2021
42668b2
Fix button
kyledurand Dec 1, 2021
f5b0569
Fix spacing
kyledurand Dec 1, 2021
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
7 changes: 2 additions & 5 deletions src/components/ActionList/ActionList.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,10 @@ $item-vertical-padding: ($item-min-height - line-height(body)) / 2;

.Title {
@include text-style-subheading;

--p-titleVerticalSpacing: calc(var(--p-space-2) * 1.5);
padding: var(--p-space-1) var(--p-space-4) var(--p-titleVerticalSpacing)
var(--p-space-4);
padding: var(--p-space-1) var(--p-space-4) var(--p-space-3) var(--p-space-4);

&.firstSectionWithTitle {
padding-top: var(--p-titleVerticalSpacing);
padding-top: var(--p-space-3);
}
}

Expand Down
34 changes: 18 additions & 16 deletions src/components/Badge/Badge.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
@import '../../styles/common';

.Badge {
--p-horizontal-padding: var(--p-space-2);
--p-vertical-padding: calc(var(--p-space-1) - #{rem(2px)});
--p-pip-size: var(--p-space-2);
--p-pip-spacing: calc(var(--p-pip-size) / 2);
--p-component-badge-pip-color: var(--p-icon);
--pc-badge-horizontal-padding: var(--p-space-2);
--pc-badge-vertical-padding: calc(var(--p-space-1) - #{rem(2px)});
--pc-badge-pip-size: var(--p-space-2);
--pc-badge-pip-spacing: calc(var(--pc-badge-pip-size) / 2);
--pc-badge-component-badge-pip-color: var(--p-icon);
display: inline-flex;
align-items: center;
padding: var(--p-vertical-padding) var(--p-horizontal-padding);
padding: var(--pc-badge-vertical-padding) var(--pc-badge-horizontal-padding);
background-color: var(--p-surface-neutral);
border-radius: var(--p-space-5);
font-size: font-size(caption);
Expand All @@ -26,31 +26,31 @@
}

.statusSuccess {
--p-component-badge-pip-color: var(--p-icon-success);
--pc-badge-component-badge-pip-color: var(--p-icon-success);
background-color: var(--p-surface-success);
color: var(--p-text);
}

.statusInfo {
--p-component-badge-pip-color: var(--p-icon-highlight);
--pc-badge-component-badge-pip-color: var(--p-icon-highlight);
background-color: var(--p-surface-highlight);
color: var(--p-text);
}

.statusAttention {
--p-component-badge-pip-color: var(--p-text-warning);
--pc-badge-component-badge-pip-color: var(--p-text-warning);
background-color: var(--p-surface-warning);
color: var(--p-text);
}

.statusWarning {
--p-component-badge-pip-color: var(--p-icon-warning);
--pc-badge-component-badge-pip-color: var(--p-icon-warning);
background-color: var(--p-surface-warning);
color: var(--p-text);
}

.statusCritical {
--p-component-badge-pip-color: var(--p-icon-critical);
--pc-badge-component-badge-pip-color: var(--p-icon-critical);
background-color: var(--p-surface-critical);
color: var(--p-text);
}
Expand All @@ -63,11 +63,13 @@
}

.Pip {
color: var(--p-component-badge-pip-color);
height: var(--p-pip-size);
width: var(--p-pip-size);
margin-right: var(--p-pip-spacing);
margin-left: calc(var(--p-vertical-padding) - var(--p-pip-spacing));
color: var(--pc-badge-component-badge-pip-color);
height: var(--pc-badge-pip-size);
width: var(--pc-badge-pip-size);
margin-right: var(--pc-badge-pip-spacing);
margin-left: calc(
var(--pc-badge-vertical-padding) - var(--pc-badge-pip-spacing)
);
border: border-width(thick) solid currentColor;
border-radius: 50%;
flex-shrink: 0;
Expand Down
64 changes: 32 additions & 32 deletions src/components/Banner/Banner.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ $ribbon-flex-basis: rem(32px);
$spinner-size: rem(20px);

@mixin banner-variants($in-page) {
--p-banner-background: var(--p-background);
--p-banner-border: var(--p-banner-border-default);
--pc-banner-background: var(--p-background);
--pc-banner-border: var(--p-banner-border-default);
transition: box-shadow var(--p-duration-200) var(--p-ease);
transition-delay: var(--p-duration-100);
box-shadow: var(--p-banner-border);
box-shadow: var(--pc-banner-border);

@if $in-page {
@include focus-ring('wide');
border-radius: var(--p-border-radius-wide);
background-color: var(--p-banner-background);
background-color: var(--pc-banner-background);
} @else {
@include focus-ring('base');
border-radius: var(--p-border-radius-base);
background-color: var(--p-banner-background);
background-color: var(--pc-banner-background);
}

@include high-contrast-outline;
Expand All @@ -28,35 +28,35 @@ $spinner-size: rem(20px);
}

&.keyFocused {
box-shadow: var(--p-banner-border);
box-shadow: var(--pc-banner-border);
@include focus-ring('wide', $style: 'focused');
}

&.statusSuccess {
--p-banner-background: var(--p-surface-success-subdued);
--p-banner-border: var(--p-banner-border-success);
--pc-banner-background: var(--p-surface-success-subdued);
--pc-banner-border: var(--p-banner-border-success);
}

&.statusInfo {
--p-banner-background: var(--p-surface-highlight-subdued);
--p-banner-border: var(--p-banner-border-highlight);
--pc-banner-background: var(--p-surface-highlight-subdued);
--pc-banner-border: var(--p-banner-border-highlight);
}

&.statusWarning {
--p-banner-background: var(--p-surface-warning-subdued);
--p-banner-border: var(--p-banner-border-warning);
--pc-banner-background: var(--p-surface-warning-subdued);
--pc-banner-border: var(--p-banner-border-warning);
}

&.statusCritical {
--p-banner-background: var(--p-surface-critical-subdued);
--p-banner-border: var(--p-banner-border-critical);
--pc-banner-background: var(--p-surface-critical-subdued);
--pc-banner-border: var(--p-banner-border-critical);
}
}

.Banner {
--p-rgb-text: 33, 43, 54;
--p-secondary-action-horizontal-padding: calc(1.5 * var(--p-space-2));
--p-secondary-action-vertical-padding: 0.5 *
--pc-banner-rgb-text: 33, 43, 54;
--pc-banner-secondary-action-horizontal-padding: calc(1.5 * var(--p-space-2));
--pc-banner-secondary-action-vertical-padding: 0.5 *
(#{control-height() - line-height(body)});
position: relative;
display: flex;
Expand Down Expand Up @@ -149,12 +149,12 @@ $spinner-size: rem(20px);
}

.withinContentContainer {
--p-banner-spacing: #{rem(14px)};
--p-banner-offset: calc(var(--p-banner-spacing) - var(--p-space-4));
padding: var(--p-space-4) var(--p-space-4) var(--p-banner-spacing);
--pc-banner-spacing: #{rem(14px)};
--pc-banner-offset: calc(var(--pc-banner-spacing) - var(--p-space-4));
padding: var(--p-space-4) var(--p-space-4) var(--pc-banner-spacing);

.ContentWrapper {
margin-top: var(--p-banner-offset);
margin-top: var(--pc-banner-offset);
}

.Dismiss {
Expand All @@ -179,13 +179,13 @@ $spinner-size: rem(20px);
}

.withinPage {
--p-banner-spacing: #{rem(18px)};
--p-banner-offset: calc(var(--p-banner-spacing) - var(--p-space-5));
--pc-banner-spacing: #{rem(18px)};
--pc-banner-offset: calc(var(--pc-banner-spacing) - var(--p-space-5));
border-radius: 0 0 border-radius() border-radius();
padding: var(--p-space-5) var(--p-space-5) var(--p-banner-spacing);
padding: var(--p-space-5) var(--p-space-5) var(--pc-banner-spacing);

.ContentWrapper {
margin-top: var(--p-banner-offset);
margin-top: var(--pc-banner-offset);
}

@include banner-variants(true);
Expand Down Expand Up @@ -240,19 +240,19 @@ $spinner-size: rem(20px);
@include unstyled-link;
display: inline-block;
text-align: left;
margin: calc(-1 * var(--p-secondary-action-vertical-padding))
calc(-0.5 * var(--p-secondary-action-horizontal-padding));
padding: var(--p-secondary-action-vertical-padding)
var(--p-secondary-action-horizontal-padding);
margin: calc(-1 * var(--pc-banner-secondary-action-vertical-padding))
calc(-0.5 * var(--pc-banner-secondary-action-horizontal-padding));
padding: var(--pc-banner-secondary-action-vertical-padding)
var(--pc-banner-secondary-action-horizontal-padding);
color: var(--p-text);
padding-left: rem(6px);

&:hover > .Text {
box-shadow: 0 -2px 0 0 rgba(var(--p-rgb-text), 0.75) inset;
box-shadow: 0 -2px 0 0 rgba(var(--pc-banner-rgb-text), 0.75) inset;
}

&:active > .Text {
box-shadow: 0 -2px 0 0 rgba(var(--p-rgb-text), 0) inset;
box-shadow: 0 -2px 0 0 rgba(var(--pc-banner-rgb-text), 0) inset;
}

&:focus > .Text {
Expand All @@ -263,7 +263,7 @@ $spinner-size: rem(20px);
}

.Text {
box-shadow: 0 -2px 0 0 rgba(var(--p-rgb-text), 0.25) inset;
box-shadow: 0 -2px 0 0 rgba(var(--pc-banner-rgb-text), 0.25) inset;
will-change: box-shadow;
transition: box-shadow var(--p-duration-200) var(--p-ease);
}
Expand Down
32 changes: 16 additions & 16 deletions src/components/Button/Button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ $partial-button-filled-pressed-box-shadow: inset 0 0 0 0 transparent,
inset 0 1px 1px 0 rgba(22, 29, 37, 0.05), inset 0 0 3px 0;

.Button {
--pc-segment: 10;
--pc-focused: 20;
--pc-button-segment: 10;
--pc-button-focused: 20;
@include button-base;

&.disabled {
@include base-button-disabled;
}

&.connectedDisclosure {
z-index: var(--pc-segment);
z-index: var(--pc-button-segment);
border-top-right-radius: 0;
border-bottom-right-radius: 0;

Expand All @@ -31,7 +31,7 @@ $partial-button-filled-pressed-box-shadow: inset 0 0 0 0 transparent,
}

&:focus {
z-index: var(--pc-focused);
z-index: var(--pc-button-focused);
}
}
}
Expand Down Expand Up @@ -121,11 +121,11 @@ $partial-button-filled-pressed-box-shadow: inset 0 0 0 0 transparent,
}

.primary {
--p-button-color: var(--p-action-primary);
--p-button-text: var(--p-text-on-primary);
--p-button-color-hover: var(--p-action-primary-hovered);
--p-button-color-active: var(--p-action-primary-pressed);
--p-button-color-depressed: var(--p-action-primary-depressed);
--pc-button-color: var(--p-action-primary);
--pc-button-text: var(--p-text-on-primary);
--pc-button-color-hover: var(--p-action-primary-hovered);
--pc-button-color-active: var(--p-action-primary-pressed);
--pc-button-color-depressed: var(--p-action-primary-depressed);
@include recolor-icon(var(--p-icon-on-primary));

&.disabled {
Expand All @@ -134,11 +134,11 @@ $partial-button-filled-pressed-box-shadow: inset 0 0 0 0 transparent,
}

.destructive {
--p-button-color: var(--p-action-critical);
--p-button-text: var(--p-text-on-critical);
--p-button-color-hover: var(--p-action-critical-hovered);
--p-button-color-active: var(--p-action-critical-pressed);
--p-button-color-depressed: var(--p-action-critical-depressed);
--pc-button-color: var(--p-action-critical);
--pc-button-text: var(--p-text-on-critical);
--pc-button-color-hover: var(--p-action-critical-hovered);
--pc-button-color-active: var(--p-action-critical-pressed);
--pc-button-color-depressed: var(--p-action-critical-depressed);
@include recolor-icon(var(--p-icon-on-critical));

&.disabled {
Expand Down Expand Up @@ -477,7 +477,7 @@ $partial-button-filled-pressed-box-shadow: inset 0 0 0 0 transparent,
}

.ConnectedDisclosure {
z-index: var(--pc-segment);
z-index: var(--pc-button-segment);
margin-left: -(border-width());
border-top-left-radius: 0;
border-bottom-left-radius: 0;
Expand All @@ -493,7 +493,7 @@ $partial-button-filled-pressed-box-shadow: inset 0 0 0 0 transparent,

&:focus,
&:active {
z-index: var(--pc-focused);
z-index: var(--pc-button-focused);
}

&.primary,
Expand Down
24 changes: 10 additions & 14 deletions src/components/ButtonGroup/ButtonGroup.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,27 @@
@import '../../styles/common';

.ButtonGroup {
--pc-item: 10;
--pc-focused: 20;
--pc-plain-horizontal-spacing: var(--p-space-2);
--pc-item-spacing: var(--p-space-2);
--pc-button-group-item: 10;
--pc-button-group-focused: 20;
display: flex;
flex-wrap: wrap;
align-items: center;
margin-top: calc(-1 * var(--pc-item-spacing));
margin-left: calc(-1 * var(--pc-item-spacing));
margin-top: calc(-1 * var(--p-space-2));
margin-left: calc(-1 * var(--p-space-2));
}

.Item {
margin-top: var(--pc-item-spacing);
margin-left: var(--pc-item-spacing);
margin-top: var(--p-space-2);
margin-left: var(--p-space-2);
}

.Item-plain {
&:not(:first-child) {
margin-left: calc(
var(--pc-item-spacing) + var(--pc-plain-horizontal-spacing)
);
margin-left: calc(var(--p-space-2) + var(--p-space-2));
}

&:not(:last-child) {
margin-right: var(--pc-plain-horizontal-spacing);
margin-right: var(--p-space-2);
}
}

Expand All @@ -37,7 +33,7 @@

.Item {
position: relative;
z-index: var(--pc-item);
z-index: var(--pc-button-group-item);
margin-top: 0;
margin-left: 0;

Expand All @@ -47,7 +43,7 @@
}

.Item-focused {
z-index: var(--pc-focused);
z-index: var(--pc-button-group-focused);
}
}

Expand Down
Loading