Skip to content

sass: Use @automattic/color-studio as a module #43650

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 1 commit into from
May 28, 2025
Merged

sass: Use @automattic/color-studio as a module #43650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 projects/js-packages/shared-extension-utils/changelog/fix-sass-import-color-studio
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: sass: `@use`/`@forward` rather than `@import` for `@automattic/color-studio`.


16 changes: 8 additions & 8 deletions projects/js-packages/shared-extension-utils/src/components/upgrade-nudge/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
@import "@automattic/color-studio/dist/color-variables";
@use "@automattic/color-studio/dist/color-variables" as studio;

.jetpack-upgrade-plan-banner .jetpack-upgrade-plan-banner__wrapper {
display: flex;
justify-content: space-between;
align-items: center;
font-size: 14px;
background: $studio-black;
background: studio.$studio-black;
padding: 0 20px;
border-radius: 2px;
box-shadow: 0 0 1px inset $studio-white; }
box-shadow: 0 0 1px inset studio.$studio-white; }

.jetpack-upgrade-plan-banner .jetpack-upgrade-plan-banner__wrapper .banner-title,
.jetpack-upgrade-plan-banner .jetpack-upgrade-plan-banner__wrapper .banner-description {
color: $studio-white; }
color: studio.$studio-white; }

.jetpack-upgrade-plan-banner .jetpack-upgrade-plan-banner__wrapper .jetpack-upgrade-plan-banner__title,
.jetpack-upgrade-plan-banner .jetpack-upgrade-plan-banner__wrapper .jetpack-upgrade-plan-banner__description {
Expand All @@ -25,15 +25,15 @@
height: 28px; }

.jetpack-upgrade-plan-banner .jetpack-upgrade-plan-banner__wrapper .components-button.is-primary {
background: $studio-pink-40;
color: $studio-white; }
background: studio.$studio-pink-40;
color: studio.$studio-white; }

.jetpack-upgrade-plan-banner .jetpack-upgrade-plan-banner__wrapper .components-button.is-primary:hover {
background: $studio-pink-30; }
background: studio.$studio-pink-30; }

.jetpack-upgrade-plan-banner .jetpack-upgrade-plan-banner__wrapper .components-button.is-primary.is-busy {
background-size: 100px 100%;
background-image: linear-gradient(-45deg, $studio-pink-40 28%, $studio-pink-60 28%, $studio-pink-60 72%, $studio-pink-40 72%); }
background-image: linear-gradient(-45deg, studio.$studio-pink-40 28%, studio.$studio-pink-60 28%, studio.$studio-pink-60 72%, studio.$studio-pink-40 72%); }

.jetpack-upgrade-plan-banner.block-editor-block-list__block {
margin-top: 0;
Expand Down
5 changes: 5 additions & 0 deletions projects/packages/masterbar/changelog/fix-sass-import-color-studio
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: sass: `@use`/`@forward` rather than `@import` for `@automattic/color-studio`.


3 changes: 2 additions & 1 deletion projects/packages/masterbar/src/admin-color-schemes/colors/_overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// This file contains overrides to _admin.scss necessary to match Calypso color schemes

// Make wpadminbar colors differ from submenu colors
@use "@automattic/color-studio/dist/color-variables" as studio;

.admin-color-aquatic,
.admin-color-classic-blue,
Expand Down Expand Up @@ -101,5 +102,5 @@

.admin-color-contrast.folded #adminmenu .toplevel_page_site-notices .wp-menu-image,
.admin-color-classic-bright.folded #adminmenu .toplevel_page_site-notices .wp-menu-image {
background-color: $studio-gray-80 !important;
background-color: studio.$studio-gray-80 !important;
}
33 changes: 17 additions & 16 deletions projects/packages/masterbar/src/admin-color-schemes/colors/aquatic/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
// make use of color studio variables for consistency across products
@import '@automattic/color-studio/dist/color-variables';
@forward "@automattic/color-studio/dist/color-variables";
@use "@automattic/color-studio/dist/color-variables" as studio;
@import '../deprecated-color-variables';

// core variables (core _variables.scss)
$base-color: $deprecated-studio-blue-80; // Calypso --color-masterbar-background
$icon-color: $deprecated-studio-blue-5; // Calypso --color-sidebar-gridicon-fill
$highlight-color: $studio-celadon-50; // Calypso --color-accent
$notification-color: $studio-celadon-30; // Calypso --color-masterbar-unread-dot-background
$highlight-color: studio.$studio-celadon-50; // Calypso --color-accent
$notification-color: studio.$studio-celadon-30; // Calypso --color-masterbar-unread-dot-background

// global (core _variables.scss)
$body-background: $studio-gray-0; // Calypso --color-surface-backdrop
$body-background: studio.$studio-gray-0; // Calypso --color-surface-backdrop

// admin menu & admin-bar (core _variables.scss)
$menu-text: $studio-white; // Calypso --color-sidebar-text
$menu-text: studio.$studio-white; // Calypso --color-sidebar-text
$menu-background: $deprecated-studio-blue-60; // Calypso --color-sidebar-background
$menu-highlight-text: $studio-white; // Calypso --color-sidebar-menu-hover-text
$menu-highlight-icon: $studio-white;
$menu-highlight-text: studio.$studio-white; // Calypso --color-sidebar-menu-hover-text
$menu-highlight-icon: studio.$studio-white;
$menu-highlight-background: $deprecated-studio-blue-50; // Calypso --color-sidebar-menu-hover-background
$menu-current-text: $deprecated-studio-blue-90; // Calypso --color-sidebar-menu-selected-text
$menu-current-icon: $menu-current-text;
$menu-current-background: $studio-yellow-20; // Calypso --color-sidebar-menu-selected-background
$menu-submenu-text: $studio-gray-10; // Calypso --color-sidebar-submenu-text
$menu-current-background: studio.$studio-yellow-20; // Calypso --color-sidebar-menu-selected-background
$menu-submenu-text: studio.$studio-gray-10; // Calypso --color-sidebar-submenu-text
$menu-submenu-background: $deprecated-studio-blue-90; // Calypso --color-sidebar-submenu-background
$menu-submenu-focus-text: $studio-yellow-20; // Calypso --color-sidebar-submenu-hover-text
$menu-submenu-current-text: $studio-white; // Calypso --color-sidebar-submenu-text
$menu-submenu-focus-text: studio.$studio-yellow-20; // Calypso --color-sidebar-submenu-hover-text
$menu-submenu-current-text: studio.$studio-white; // Calypso --color-sidebar-submenu-text
$adminbar-avatar-frame: $deprecated-studio-blue-80;

// masterbar overrides
Expand All @@ -39,11 +40,11 @@ $nav-unification-sidebar-text-alternative: $deprecated-studio-blue-5; // Calypso
$color-primary: $deprecated-studio-blue-50; // Calypso --color-primary
$color-primary-dark: $deprecated-studio-blue-70; // Calypso --color-primary-dark
$color-primary-light: $deprecated-studio-blue-30; // Calypso --color-primary-light
$color-surface: $studio-white; // Calypso --color-surface
$color-surface: studio.$studio-white; // Calypso --color-surface

// Calypso Sidebar Nudges
$menu-nudge-background: $studio-white;
$menu-nudge-text-color: $studio-black;
$menu-nudge-background: studio.$studio-white;
$menu-nudge-text-color: studio.$studio-black;
$menu-nudge-cta-background: $highlight-color;
$menu-nudge-cta-color: $studio-white;
$menu-nudge-cta-background-hover: $studio-celadon-60;
$menu-nudge-cta-color: studio.$studio-white;
$menu-nudge-cta-background-hover: studio.$studio-celadon-60;
11 changes: 6 additions & 5 deletions projects/packages/masterbar/src/admin-color-schemes/colors/blue/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// make use of color studio variables for consistency across products
@import '@automattic/color-studio/dist/color-variables';
@forward "@automattic/color-studio/dist/color-variables";
@use "@automattic/color-studio/dist/color-variables" as studio;

$highlight-color: #096484;

// Sidebar Nudges
$menu-nudge-background: $studio-white;
$menu-nudge-text-color: $studio-black;
$menu-nudge-background: studio.$studio-white;
$menu-nudge-text-color: studio.$studio-black;
$menu-nudge-cta-background: $highlight-color;
$menu-nudge-cta-color: $studio-white;
$menu-nudge-cta-background-hover: $studio-blue-60;
$menu-nudge-cta-color: studio.$studio-white;
$menu-nudge-cta-background-hover: studio.$studio-blue-60;
41 changes: 21 additions & 20 deletions projects/packages/masterbar/src/admin-color-schemes/colors/classic-blue/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
// make use of color studio variables for consistency across products
@import '@automattic/color-studio/dist/color-variables';
@forward "@automattic/color-studio/dist/color-variables";
@use "@automattic/color-studio/dist/color-variables" as studio;
@import '../deprecated-color-variables';

// core variables (core _variables.scss)
$base-color: $deprecated-studio-blue-60; // Calypso --color-masterbar-background
$icon-color: $studio-gray-50; // Calypso --color-sidebar-gridicon-fill
$highlight-color: $studio-orange-50; // Calypso --color-accent
$notification-color: $studio-orange-30; // Calypso --color-masterbar-unread-dot-background
$icon-color: studio.$studio-gray-50; // Calypso --color-sidebar-gridicon-fill
$highlight-color: studio.$studio-orange-50; // Calypso --color-accent
$notification-color: studio.$studio-orange-30; // Calypso --color-masterbar-unread-dot-background

// global (core _variables.scss)
$body-background: $studio-gray-0; // Calypso --color-surface-backdrop
$body-background: studio.$studio-gray-0; // Calypso --color-surface-backdrop

// admin menu & admin-bar (core _variables.scss)
$menu-text: $studio-gray-80; // Calypso --color-sidebar-text
$menu-background: $studio-gray-5; // Calypso --color-sidebar-background
$menu-text: studio.$studio-gray-80; // Calypso --color-sidebar-text
$menu-background: studio.$studio-gray-5; // Calypso --color-sidebar-background
$menu-highlight-text: $deprecated-studio-blue-50; // Calypso --color-sidebar-menu-hover-text
$menu-highlight-icon: $deprecated-studio-blue-50;
$menu-highlight-background: $studio-white; // Calypso --color-sidebar-menu-hover-background
$menu-current-text: $studio-white; // Calypso --color-sidebar-menu-selected-text
$menu-highlight-background: studio.$studio-white; // Calypso --color-sidebar-menu-hover-background
$menu-current-text: studio.$studio-white; // Calypso --color-sidebar-menu-selected-text
$menu-current-icon: $menu-current-text;
$menu-current-background: $studio-gray-60; // Calypso --color-sidebar-menu-selected-background
$menu-submenu-text: $studio-white; // Calypso --color-sidebar-submenu-text
$menu-current-background: studio.$studio-gray-60; // Calypso --color-sidebar-menu-selected-background
$menu-submenu-text: studio.$studio-white; // Calypso --color-sidebar-submenu-text
$menu-submenu-background: $deprecated-studio-blue-60; // Calypso --color-sidebar-submenu-background
$menu-submenu-focus-text: $studio-orange-30; // Calypso --color-sidebar-submenu-hover-text
$menu-submenu-current-text: $studio-white; // Calypso --color-sidebar-submenu-text
$menu-submenu-focus-text: studio.$studio-orange-30; // Calypso --color-sidebar-submenu-hover-text
$menu-submenu-current-text: studio.$studio-white; // Calypso --color-sidebar-submenu-text
$adminbar-avatar-frame: $deprecated-studio-blue-70;

// masterbar overrides
Expand All @@ -34,18 +35,18 @@ $masterbar-submenu-background: $deprecated-studio-blue-70;
$masterbar-submenu-background-alt: $deprecated-studio-blue-80;

// nav unification overrides
$nav-unification-sidebar-border: $studio-gray-10; // Calypso --color-sidebar-border
$nav-unification-sidebar-text-alternative: $studio-gray-50; // Calypso --color-sidebar-text-alternative
$nav-unification-sidebar-border: studio.$studio-gray-10; // Calypso --color-sidebar-border
$nav-unification-sidebar-text-alternative: studio.$studio-gray-50; // Calypso --color-sidebar-text-alternative

// Calypso color variables used in e.g. inline help
$color-primary: $deprecated-studio-blue-50; // Calypso --color-primary
$color-primary-dark: $deprecated-studio-blue-70; // Calypso --color-primary-dark
$color-primary-light: $deprecated-studio-blue-30; // Calypso --color-primary-light
$color-surface: $studio-white; // Calypso --color-surface
$color-surface: studio.$studio-white; // Calypso --color-surface

// Sidebar Nudges
$menu-nudge-background: $studio-white;
$menu-nudge-text-color: $studio-black;
$menu-nudge-background: studio.$studio-white;
$menu-nudge-text-color: studio.$studio-black;
$menu-nudge-cta-background: $highlight-color;
$menu-nudge-cta-color: $studio-white;
$menu-nudge-cta-background-hover: $studio-orange-60;
$menu-nudge-cta-color: studio.$studio-white;
$menu-nudge-cta-background-hover: studio.$studio-orange-60;
39 changes: 20 additions & 19 deletions projects/packages/masterbar/src/admin-color-schemes/colors/classic-bright/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
// make use of color studio variables for consistency across products
@import '@automattic/color-studio/dist/color-variables';
@forward "@automattic/color-studio/dist/color-variables";
@use "@automattic/color-studio/dist/color-variables" as studio;
@import '../deprecated-color-variables';

// core variables (core _variables.scss)
$base-color: $deprecated-studio-blue-60; // Calypso --color-masterbar-background
$icon-color: $studio-gray-50; // Calypso --color-sidebar-gridicon-fill
$highlight-color: $studio-pink-50; // Calypso --color-accent
$notification-color: $studio-pink-20; // Calypso --color-masterbar-unread-dot-background
$icon-color: studio.$studio-gray-50; // Calypso --color-sidebar-gridicon-fill
$highlight-color: studio.$studio-pink-50; // Calypso --color-accent
$notification-color: studio.$studio-pink-20; // Calypso --color-masterbar-unread-dot-background

// global (core _variables.scss)
$body-background: $studio-gray-0; // Calypso --color-surface-backdrop
$body-background: studio.$studio-gray-0; // Calypso --color-surface-backdrop

// admin menu & admin-bar (core _variables.scss)
$menu-text: $studio-gray-80; // Calypso --color-sidebar-text
$menu-background: $studio-white; // Calypso --color-sidebar-background
$menu-highlight-text: $studio-gray-90; // Calypso --color-sidebar-menu-hover-text
$menu-highlight-icon: $studio-gray-90;
$menu-highlight-background: $studio-gray-5; // Calypso --color-sidebar-menu-hover-background
$menu-text: studio.$studio-gray-80; // Calypso --color-sidebar-text
$menu-background: studio.$studio-white; // Calypso --color-sidebar-background
$menu-highlight-text: studio.$studio-gray-90; // Calypso --color-sidebar-menu-hover-text
$menu-highlight-icon: studio.$studio-gray-90;
$menu-highlight-background: studio.$studio-gray-5; // Calypso --color-sidebar-menu-hover-background
$menu-current-text: $deprecated-studio-blue-70; // Calypso --color-sidebar-menu-selected-text
$menu-current-icon: $menu-current-text;
$menu-current-background: $deprecated-studio-blue-5; // Calypso --color-sidebar-menu-selected-background
$menu-submenu-text: $deprecated-studio-blue-70; // Calypso --color-sidebar-submenu-text
$menu-submenu-background: $deprecated-studio-blue-0; // Calypso --color-sidebar-submenu-background
$menu-submenu-focus-text: $studio-gray-90; // Calypso --color-sidebar-submenu-hover-text
$menu-submenu-current-text: $studio-pink-50; // Calypso --color-sidebar-submenu-selected-text
$menu-submenu-focus-text: studio.$studio-gray-90; // Calypso --color-sidebar-submenu-hover-text
$menu-submenu-current-text: studio.$studio-pink-50; // Calypso --color-sidebar-submenu-selected-text
$adminbar-avatar-frame: $deprecated-studio-blue-70;

// masterbar overrides
Expand All @@ -34,18 +35,18 @@ $masterbar-submenu-background: $deprecated-studio-blue-70;
$masterbar-submenu-background-alt: $deprecated-studio-blue-80;

// nav unification overrides
$nav-unification-sidebar-border: $studio-gray-5; // Calypso --color-sidebar-border
$nav-unification-sidebar-text-alternative: $studio-gray-50; // Calypso --color-sidebar-text-alternative
$nav-unification-sidebar-border: studio.$studio-gray-5; // Calypso --color-sidebar-border
$nav-unification-sidebar-text-alternative: studio.$studio-gray-50; // Calypso --color-sidebar-text-alternative

// Calypso color variables used in e.g. inline help
$color-primary: $deprecated-studio-blue-50; // Calypso --color-primary
$color-primary-dark: $deprecated-studio-blue-70; // Calypso --color-primary-dark
$color-primary-light: $deprecated-studio-blue-30; // Calypso --color-primary-light
$color-surface: $studio-white; // Calypso --color-surface
$color-surface: studio.$studio-white; // Calypso --color-surface

// Sidebar Nudges
$menu-nudge-background: $studio-gray-80;
$menu-nudge-text-color: $studio-white;
$menu-nudge-background: studio.$studio-gray-80;
$menu-nudge-text-color: studio.$studio-white;
$menu-nudge-cta-background: $highlight-color;
$menu-nudge-cta-color: $studio-white;
$menu-nudge-cta-background-hover: $studio-pink-60;
$menu-nudge-cta-color: studio.$studio-white;
$menu-nudge-cta-background-hover: studio.$studio-pink-60;
25 changes: 13 additions & 12 deletions projects/packages/masterbar/src/admin-color-schemes/colors/classic-dark/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
// make use of color studio variables for consistency across products
@import '@automattic/color-studio/dist/color-variables';
@forward "@automattic/color-studio/dist/color-variables";
@use "@automattic/color-studio/dist/color-variables" as studio;

// core variables (core _variables.scss)
$base-color: #101517; // Calypso --color-masterbar-background
$icon-color: #a2aab2; // Calypso --color-sidebar-gridicon-fill
$highlight-color: $studio-pink-50;// Calypso --color-accent
$highlight-color: studio.$studio-pink-50;// Calypso --color-accent
$notification-color: $highlight-color;

// global (core _variables.scss)
$body-background: $studio-gray-0; // Calypso --color-surface-backdrop
$body-background: studio.$studio-gray-0; // Calypso --color-surface-backdrop

// admin menu & admin-bar (core _variables.scss)
$menu-text: #eee; // Calypso --color-sidebar-text
Expand All @@ -22,7 +23,7 @@ $menu-current-background: #0073aa; // Calypso --color-sidebar-menu-selected-back
$menu-submenu-text: #b4b9be; // Calypso --color-sidebar-submenu-text
$menu-submenu-background: #333; // Calypso --color-sidebar-submenu-background
$menu-submenu-focus-text: #00b9eb; // Calypso --color-sidebar-submenu-hover-text
$menu-submenu-current-text: $studio-white; // Calypso --color-sidebar-submenu-selected-text
$menu-submenu-current-text: studio.$studio-white; // Calypso --color-sidebar-submenu-selected-text
$adminbar-avatar-frame: #333;

// masterbar overrides
Expand All @@ -35,14 +36,14 @@ $nav-unification-sidebar-border: #333; // Calypso --color-sidebar-border
$nav-unification-sidebar-text-alternative: #a2aab2; // Calypso --color-sidebar-text-alternative

// Calypso color variables used in e.g. inline help
$color-primary: $studio-gray-90; // Calypso --color-primary
$color-primary-dark: $studio-gray-70; // Calypso --color-primary-dark
$color-primary-light: $studio-gray-30; // Calypso --color-primary-light
$color-surface: $studio-white; // Calypso --color-surface
$color-primary: studio.$studio-gray-90; // Calypso --color-primary
$color-primary-dark: studio.$studio-gray-70; // Calypso --color-primary-dark
$color-primary-light: studio.$studio-gray-30; // Calypso --color-primary-light
$color-surface: studio.$studio-white; // Calypso --color-surface

// Sidebar Nudges
$menu-nudge-background: $studio-white;
$menu-nudge-text-color: $studio-black;
$menu-nudge-background: studio.$studio-white;
$menu-nudge-text-color: studio.$studio-black;
$menu-nudge-cta-background: $highlight-color;
$menu-nudge-cta-color: $studio-white;
$menu-nudge-cta-background-hover: $studio-pink-60;
$menu-nudge-cta-color: studio.$studio-white;
$menu-nudge-cta-background-hover: studio.$studio-pink-60;
11 changes: 6 additions & 5 deletions projects/packages/masterbar/src/admin-color-schemes/colors/coffee/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// make use of color studio variables for consistency across products
@import '@automattic/color-studio/dist/color-variables';
@forward "@automattic/color-studio/dist/color-variables";
@use "@automattic/color-studio/dist/color-variables" as studio;

$highlight-color: #c7a589;

// Sidebar Nudges
$menu-nudge-background: $studio-white;
$menu-nudge-text-color: $studio-black;
$menu-nudge-background: studio.$studio-white;
$menu-nudge-text-color: studio.$studio-black;
$menu-nudge-cta-background: $highlight-color;
$menu-nudge-cta-color: $studio-white;
$menu-nudge-cta-background-hover: $studio-orange-60;
$menu-nudge-cta-color: studio.$studio-white;
$menu-nudge-cta-background-hover: studio.$studio-orange-60;
Loading
Loading