Skip to content

[Maintenance] Clean up css custom properties #4839

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 4 commits into from
Dec 16, 2021
Merged

[Maintenance] Clean up css custom properties #4839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4e8989
[Maintenance] Clean up css custom properties
kyledurand Dec 15, 2021
fd5f07e
Getting back to visual pairity with main
kyledurand Dec 15, 2021
d895a12
Remove tokens.ts file
kyledurand Dec 15, 2021
22b4fb6
Update src/components/RangeSlider/components/DualThumb/DualThumb.scss
kyledurand Dec 15, 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
6 changes: 3 additions & 3 deletions src/components/Avatar/Avatar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@import '../../styles/common';

.Avatar {
--pc-avatar-extra-small-size: var(--p-space-6);
--pc-avatar-small-size: var(--p-space-8);
--pc-avatar-medium-size: var(--p-space-10);
--pc-avatar-extra-small-size: 24px;
Copy link
Contributor

@aveline aveline Dec 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure these sizes should be coupled with the spacing scale. If we made adjustments to the spacing scale, would we also expect avatar size to change?

Copy link
Member Author

@kyledurand kyledurand Dec 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, that's why I decoupled them. Might make our coverage worse but I think they should just be hard coded 👍

Copy link
Contributor

@aveline aveline Dec 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha my bad I was reading the diff backwards! But yes agree! 👍

--pc-avatar-small-size: 32px;
--pc-avatar-medium-size: 40px;
--pc-avatar-large-size: 60px;
position: relative;
display: block;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Badge/Badge.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

.Badge {
--pc-badge-horizontal-padding: var(--p-space-2);
--pc-badge-vertical-padding: calc(var(--p-space-1) - 2px);
--pc-badge-vertical-padding: var(--p-space-05);
--pc-badge-pip-size: var(--p-space-2);
--pc-badge-pip-spacing: calc(var(--pc-badge-pip-size) / 2);
--pc-badge-pip-spacing: var(--p-space-1);
--pc-badge-component-badge-pip-color: var(--p-icon);
display: inline-flex;
align-items: center;
Expand Down
3 changes: 2 additions & 1 deletion src/components/Banner/Banner.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

.Banner {
--pc-banner-rgb-text: 33, 43, 54;
--pc-banner-secondary-action-horizontal-padding: calc(1.5 * var(--p-space-2));
--pc-banner-secondary-action-horizontal-padding: var(--p-space-3);
--pc-banner-secondary-action-vertical-padding: 0.5 *
(#{control-height() - line-height(body)});
position: relative;
Expand Down Expand Up @@ -141,6 +141,7 @@
}

.ContentWrapper {
margin-top: calc(-1 * var(--p-space-05));
flex: 1 1 auto;
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/ColorPicker/ColorPicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
.ColorPicker {
--pc-color-picker-size: 160px;
--pc-color-picker-dragger-size: 18px;
--pc-color-picker: 10;
--pc-color-picker-z-index: 10;
--pc-color-picker-adjustments: 20;
--pc-color-picker-dragger: 30;
user-select: none;
Expand Down Expand Up @@ -118,7 +118,7 @@ $huepicker-bottom-padding-start: calc(

.ColorLayer {
position: absolute;
z-index: var(--pc-color-picker);
z-index: var(--pc-color-picker-z-index);
top: 0;
left: 0;
height: 100%;
Expand Down
2 changes: 1 addition & 1 deletion src/components/DatePicker/DatePicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
$font-size: 12px;

.DatePicker {
--pc-date-picker-range-end-border-radius: 30px;
--pc-date-picker-range-end-border-radius: var(--p-border-radius-6);
position: relative;
}

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

$size: 10px;
$base-position: -4px;

.Indicator {
--pc-indicator-size: 10px;
--pc-indicator-base-position: calc(-1 * var(--p-space-1));

&::before,
&::after {
content: '';
position: absolute;
background-color: var(--p-border-highlight);
right: $base-position;
top: $base-position;
width: $size;
height: $size;
right: var(--pc-indicator-base-position);
top: var(--pc-indicator-base-position);
width: var(--pc-indicator-size);
height: var(--pc-indicator-size);
border-radius: var(--p-border-radius-half);
border: calc(#{$size} / 2) solid transparent;
border: calc(var(--pc-indicator-size) / 2) solid transparent;
}
}

Expand All @@ -24,8 +24,8 @@ $base-position: -4px;
}

.pulseIndicator::after {
right: $base-position;
top: $base-position;
right: var(--pc-indicator-base-position);
top: var(--pc-indicator-base-position);
animation: pulse 5s ease infinite;
}

Expand Down
5 changes: 2 additions & 3 deletions src/components/InlineError/InlineError.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
@import '../../styles/common';

.InlineError {
--pc-inline-error-icon-adjustment: var(--p-space-05);
display: flex;
color: var(--p-text-critical);
fill: var(--p-icon-critical);
}

.Icon {
fill: currentColor;
margin-left: calc(-1 * var(--pc-inline-error-icon-adjustment));
margin-right: calc(var(--p-space-1) + var(--pc-inline-error-icon-adjustment));
margin-left: calc(-1 * var(--p-space-05));
margin-right: calc(var(--p-space-05) + var(--p-space-1));
}
7 changes: 3 additions & 4 deletions src/components/KeyboardKey/KeyboardKey.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
$key-base-height: 24px;

.KeyboardKey {
--pc-keyboard-key-bottom-shadow-size: 2px;
display: inline-block;
height: $key-base-height;
margin: 0 calc(var(--p-space-1) / 2) var(--pc-keyboard-key-bottom-shadow-size);
margin: 0 calc(var(--p-space-1) / 2) var(--p-space-05);
padding: 0 var(--p-space-1);
background-color: var(--p-surface);
box-shadow: 0 0 0 1px var(--p-border-subdued),
0 var(--pc-keyboard-key-bottom-shadow-size) 0 0 var(--p-surface),
0 var(--pc-keyboard-key-bottom-shadow-size) 0 1px var(--p-border-subdued);
0 var(--p-space-05) 0 0 var(--p-surface),
0 var(--p-space-05) 0 1px var(--p-border-subdued);
border-radius: var(--p-border-radius-1);
font-family: font-family();
font-size: 12px;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Navigation/Navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,8 @@ $secondary-item-font-size: 15px;
}

.Text {
margin-top: var(--p-space-1);
margin-bottom: var(--p-space-1);
margin-top: calc(var(--p-space-1) + var(--p-space-05));
margin-bottom: calc(var(--p-space-1) + var(--p-space-05));
line-height: 20px;
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/Navigation/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ $item-line-height-small: 32px;
$item-line-height-large: 36px;
$text-line-height: 20px;
$nav-variables: (
mobile-spacing: var(--p-space-2),
desktop-spacing: var(--p-space-1),
mobile-spacing: calc(var(--p-space-2) + var(--p-space-05)),
desktop-spacing: calc(var(--p-space-1) + var(--p-space-05)),
mobile-height: 40px,
desktop-height: 32px,
icon-size: 20px,
Expand Down
1 change: 0 additions & 1 deletion src/components/Page/components/Header/Header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ $mobile-layout: 468px;
$button-style-breakpoint: 768px;
$medium-layout: 860px;
$desktop-layout: 1080px;
$individual-action-padding-x: calc(1.5 * var(--p-space-2));
$action-menu-rollup-computed-width: 40px;

.Header {
Expand Down
9 changes: 4 additions & 5 deletions src/components/RangeSlider/components/DualThumb/DualThumb.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@import '../../RangeSlider';

$range-wrapper: 28px;

$range-thumb-border-error: 2px solid var(--p-border-critical);

.DualThumb {
Expand Down Expand Up @@ -34,7 +33,7 @@ $range-thumb-border-error: 2px solid var(--p-border-critical);
border-radius: var(--pc-range-slider-thumb-size);

--pc-dual-thumb-unselected-range: transparent;
--pc-dual-thumb-selected-range: #{var(--p-interactive)};
--pc-dual-thumb-selected-range: var(--p-interactive);
--pc-dual-thumb-gradient-colors: var(--pc-dual-thumb-unselected-range) 0%,
var(--pc-dual-thumb-unselected-range) var(--pc-range-slider-progress-lower),
var(--pc-dual-thumb-selected-range) var(--pc-range-slider-progress-lower),
Expand All @@ -47,7 +46,7 @@ $range-thumb-border-error: 2px solid var(--p-border-critical);
);

.error & {
--pc-dual-thumb-selected-range: #{var(--p-action-critical)};
--pc-dual-thumb-selected-range: var(--p-action-critical);
--pc-dual-thumb-gradient-colors: var(--pc-dual-thumb-unselected-range) 0%,
var(--pc-dual-thumb-unselected-range)
var(--pc-range-slider-progress-lower),
Expand Down Expand Up @@ -134,15 +133,15 @@ $range-output-spacing: 16px;
transition-property: opacity, visibility, bottom;
transition-duration: var(--p-duration-150);
transition-timing-function: var(--p-ease);
transform: translateX(calc(-50% + #{var(--pc-range-slider-thumb-size) / 2}));
transform: translateX(calc(-50% + (var(--pc-range-slider-thumb-size) / 2)));

.Thumbs:active + & {
$range-thumb-size-difference: var(--p-range-slider-thumb-size-active) -
var(--p-range-slider-thumb-size-base);
opacity: 1;
visibility: visible;
bottom: calc(
#{var(--p-range-slider-thumb-size-active)} + #{$range-thumb-size-difference}
var(--p-range-slider-thumb-size-active) + #{$range-thumb-size-difference}
);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/RangeSlider/components/SingleThumb/SingleThumb.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
}

.Input {
--pc-single-thumb-progress-lower: #{var(--p-interactive)};
--pc-single-thumb-progress-lower: var(--p-interactive);
--pc-single-thumb-progress-upper: transparent;
// create-react-app v2 leverages postcss-preset-env to transpile modern CSS
// into something kinda supported by older browsers. Unfortunately its
Expand Down Expand Up @@ -134,7 +134,7 @@
}

.error & {
--pc-single-thumb-progress-lower: #{var(--p-action-critical)};
--pc-single-thumb-progress-lower: var(--p-action-critical);

@include range-thumb-selectors {
border-color: var(--p-action-critical);
Expand Down
12 changes: 5 additions & 7 deletions src/components/ResourceItem/ResourceItem.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

// translate-offset equals handle-width - padding
$resource-list-item-variables: (
padding: 12px,
control-indent: -1 * 12px,
min-height: 44px,
handle-width: 48px,
disclosure-width: 48px,
Expand Down Expand Up @@ -98,13 +96,13 @@ $resource-list-item-variables: (
.Container {
position: relative;
z-index: resource-list-item(content-stacking-order);
padding: resource-list-item(padding) var(--p-space-4);
padding: var(--p-space-3) var(--p-space-4);
min-height: resource-list-item(min-height);
display: flex;
align-items: flex-start;

@include breakpoint-after(resource-list-item(breakpoint-small)) {
padding: resource-list-item(padding) var(--p-space-5);
padding: var(--p-space-3) var(--p-space-5);
}
}

Expand Down Expand Up @@ -142,8 +140,8 @@ $resource-list-item-variables: (
min-height: resource-list-item(min-height);
justify-content: center;
align-items: center;
margin: (-1 * resource-list-item(padding)) var(--p-space-1)
(-1 * resource-list-item(padding)) resource-list-item(control-indent);
margin: calc(-1 * var(--p-space-3)) var(--p-space-1)
calc(-1 * var(--p-space-3)) calc(-1 * var(--p-space-3));
display: flex;

@include breakpoint-before(resource-list-item(breakpoint-small), false) {
Expand Down Expand Up @@ -225,7 +223,7 @@ $resource-list-item-variables: (

.Disclosure {
position: relative;
top: -1 * resource-list-item(padding);
top: calc(-1 * var(--p-space-3));
right: calc(-1 * var(--p-space-4));
display: none;
width: resource-list-item(disclosure-width);
Expand Down
4 changes: 1 addition & 3 deletions src/components/ResourceList/ResourceList.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,11 @@ $item-wrapper-loading-height: 64px;
align-items: flex-start;
width: 100%;
min-height: resource-list(header-min-height);
padding: resource-list(header-vertical-padding)
resource-list(header-padding-small);
padding: calc(var(--p-space-3) - var(--p-space-05)) var(--p-space-4);
background-color: var(--p-surface);

@include breakpoint-after(resource-list(breakpoint-small)) {
flex-direction: row;
padding: resource-list(header-vertical-padding) var(--p-space-4);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/Scrollable/Scrollable.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '../../styles/common';

.Scrollable {
--pc-scrollable-shadow-size: 20px;
--pc-scrollable-shadow-size: var(--p-space-5);
--pc-scrollable-shadow-bottom: inset 0
calc(-1 * var(--pc-scrollable-shadow-size)) var(--pc-scrollable-shadow-size)
calc(-1 * var(--pc-scrollable-shadow-size)) var(--p-hint-from-direct-light);
Expand Down
3 changes: 1 addition & 2 deletions src/components/SkeletonPage/SkeletonPage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import '../../styles/common';

$action-text-spacing: 24px;
$primary-action-button-height: 36px;
$primary-action-button-width: 100px;
$skeleton-display-text-max-width: 120px;
Expand Down Expand Up @@ -97,7 +96,7 @@ $skeleton-display-text-max-width: 120px;
flex-direction: column;
justify-content: center;
min-height: control-slim-height();
padding-right: $action-text-spacing;
padding-right: var(--p-space-6);
margin-top: calc(-1 * var(--p-space-1));
margin-bottom: calc(-1 * var(--p-space-1));
padding-top: var(--p-space-4);
Expand Down
2 changes: 1 addition & 1 deletion src/styles/foundation/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ $dismiss-icon-size: 32px;
}

@function mobile-nav-width() {
@return calc(100vw - #{$dismiss-icon-size} + #{$dangerous-magic-space-8});
@return calc(100vw - (#{$dismiss-icon-size} + #{$dangerous-magic-space-8}));
}

@function nav-min-window-corrected() {
Expand Down
1 change: 1 addition & 0 deletions src/tokens/token-groups/shape.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"border-radius-3": "12px",
"border-radius-4": "16px",
"border-radius-5": "20px",
"border-radius-6": "30px",
"border-radius-base": "3px",
"border-radius-large": "6px",
"border-radius-half": "50%"
Expand Down