Skip to content

Commit

Permalink
Admin bar: clean up WPCOM_ADMIN_BAR_UNIFICATION feature flag (#39692)
Browse files Browse the repository at this point in the history 
* Admin bar: clean up WPCOM_ADMIN_BAR_UNIFICATION

* changelog
  • Loading branch information
@fushar
fushar authored Oct 10, 2024
1 parent d5aee4b commit 329c194
Show file tree
Hide file tree
Showing 31 changed files with 5 additions and 1,822 deletions.
4 changes: 4 additions & 0 deletions projects/packages/masterbar/changelog/admin-bar-cleanup
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Admin bar: clean up WPCOM_ADMIN_BAR_UNIFICATION feature flag
19 changes: 1 addition & 18 deletions projects/packages/masterbar/src/admin-color-schemes/class-admin-color-schemes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@ public function __construct() {
add_action( 'rest_api_init', array( $this, 'register_admin_color_meta' ) );
}

if ( ( defined( 'WPCOM_ADMIN_BAR_UNIFICATION' ) && WPCOM_ADMIN_BAR_UNIFICATION ) || get_option( 'wpcom_admin_interface' ) === 'wp-admin' ) { // Simple and Atomic sites.
if ( ( new Host() )->is_wpcom_platform() ) { // Simple and Atomic sites.
add_filter( 'css_do_concat', array( $this, 'disable_css_concat_for_color_schemes' ), 10, 2 );
add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_color_scheme_for_sidebar_notice' ) );
} else { // self-hosted sites.
add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_core_color_schemes_overrides' ) );
}
}

Expand Down Expand Up @@ -208,21 +206,6 @@ public function register_admin_color_schemes() {
);
}

/**
* Enqueues current color-scheme overrides for core color schemes
*/
public function enqueue_core_color_schemes_overrides() {
$color_scheme = get_user_option( 'admin_color' );
if ( in_array( $color_scheme, static::CORE_COLOR_SCHEMES, true ) ) {
wp_enqueue_style(
'jetpack-core-color-schemes-overrides',
$this->get_admin_color_scheme_url( $color_scheme ),
array(),
Main::PACKAGE_VERSION
);
}
}

/**
* Enqueues current color-scheme sidebar notice overrides for core color schemes
*/
Expand Down
79 changes: 0 additions & 79 deletions projects/packages/masterbar/src/admin-color-schemes/colors/_core-overrides.scss
View file

This file was deleted.

14 changes: 0 additions & 14 deletions projects/packages/masterbar/src/admin-color-schemes/colors/blue/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,7 @@
@import 'node_modules/@automattic/color-studio/dist/color-variables.scss';
@import 'node_modules/@automattic/color-studio/dist/color-variables-rgb.scss';

// Core overrides
$masterbar-background: #52accc;
$menu-submenu-background: #4796b3;
$text-color: #fff;
$highlight-color: #096484;
$base-color-rgb: rgb(82, 172, 204);
$nav-unification-sidebar-text-alternative: #e2ecf1;
$menu-highlight-text: #fff;

// Calypso color variables used in e.g. inline help
$color-primary: #096484; // Calypso --color-primary
$color-primary-dark: $studio-blue-70; // Calypso --color-primary-dark
$color-primary-light: $studio-blue-30; // Calypso --color-primary-light
$color-surface: $studio-white; // Calypso --color-surface
$color-neutral-100-rgb: $studio-gray-100-rgb; // Calypso --color-neutral-100-rgb

// Sidebar Nudges
$menu-nudge-background: $studio-white;
Expand Down
5 changes: 0 additions & 5 deletions projects/packages/masterbar/src/admin-color-schemes/colors/blue/colors.scss
View file

This file was deleted.

13 changes: 0 additions & 13 deletions projects/packages/masterbar/src/admin-color-schemes/colors/coffee/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,7 @@
@import 'node_modules/@automattic/color-studio/dist/color-variables.scss';
@import 'node_modules/@automattic/color-studio/dist/color-variables-rgb.scss';

$masterbar-background: #59524c;
$menu-submenu-background: #46403c;
$text-color: #fff;
$highlight-color: #c7a589;
$base-color-rgb: rgb(89, 82, 76);
$nav-unification-sidebar-text-alternative: #f6f7f7;
$menu-highlight-text: #fff;

// Calypso color variables used in e.g. inline help
$color-primary: #c7a589; // Calypso --color-primary
$color-primary-dark: $studio-orange-70; // Calypso --color-primary-dark
$color-primary-light: $studio-orange-30; // Calypso --color-primary-light
$color-surface: $studio-white; // Calypso --color-surface
$color-neutral-100-rgb: $studio-gray-100-rgb; // Calypso --color-neutral-100-rgb

// Sidebar Nudges
$menu-nudge-background: $studio-white;
Expand Down
5 changes: 0 additions & 5 deletions projects/packages/masterbar/src/admin-color-schemes/colors/coffee/colors.scss
View file

This file was deleted.

13 changes: 0 additions & 13 deletions projects/packages/masterbar/src/admin-color-schemes/colors/ectoplasm/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,7 @@
@import 'node_modules/@automattic/color-studio/dist/color-variables.scss';
@import 'node_modules/@automattic/color-studio/dist/color-variables-rgb.scss';

$masterbar-background: #523f6d;
$menu-submenu-background: #413256;
$text-color: #fff;
$highlight-color: #a3b745;
$base-color-rgb: rgb(82, 63, 109);
$nav-unification-sidebar-text-alternative: #ffffff;
$menu-highlight-text: #fff;

// Calypso color variables used in e.g. inline help
$color-primary: #a3b745; // Calypso --color-primary
$color-primary-dark: #536700; // Calypso --color-primary-dark
$color-primary-light: #b5de00; // Calypso --color-primary-light
$color-surface: $studio-white; // Calypso --color-surface
$color-neutral-100-rgb: $studio-gray-100-rgb; // Calypso --color-neutral-100-rgb

// Sidebar Nudges
$menu-nudge-background: $studio-white;
Expand Down
5 changes: 0 additions & 5 deletions projects/packages/masterbar/src/admin-color-schemes/colors/ectoplasm/colors.scss
View file

This file was deleted.

15 changes: 0 additions & 15 deletions projects/packages/masterbar/src/admin-color-schemes/colors/fresh/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@
@import 'node_modules/@automattic/color-studio/dist/color-variables.scss';
@import 'node_modules/@automattic/color-studio/dist/color-variables-rgb.scss';

$masterbar-background: #101517;
$menu-submenu-background: #333333;
$text-color: #fff;
$highlight-color: #006fad;
$base-color-rgb: rgb(35,40,45);
$nav-unification-sidebar-text-alternative: #a2aab2;
$menu-highlight-text: #00b9eb;

// 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-neutral-100-rgb: $studio-gray-100-rgb; // Calypso --color-neutral-100-rgb

// Sidebar Nudges
$menu-nudge-background: $studio-white;
$menu-nudge-text-color: $studio-black;
Expand Down
13 changes: 0 additions & 13 deletions projects/packages/masterbar/src/admin-color-schemes/colors/light/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,7 @@
@import 'node_modules/@automattic/color-studio/dist/color-variables.scss';
@import 'node_modules/@automattic/color-studio/dist/color-variables-rgb.scss';

$masterbar-background: #e5e5e5;
$menu-submenu-background: #fff;
$text-color: #333;
$highlight-color: #888;
$base-color-rgb: rgb(229, 229, 229);
$nav-unification-sidebar-text-alternative: #1d2327;
$menu-highlight-text: #fff;

// Calypso color variables used in e.g. inline help
$color-primary: #04a4cc; // Calypso --color-primary
$color-primary-dark: $studio-blue-70; // Calypso --color-primary-dark
$color-primary-light: $studio-blue-30; // Calypso --color-primary-light
$color-surface: $studio-white; // Calypso --color-surface
$color-neutral-100-rgb: $studio-gray-100-rgb; // Calypso --color-neutral-100-rgb

// Sidebar Nudges
$menu-nudge-background: $studio-white;
Expand Down
13 changes: 0 additions & 13 deletions projects/packages/masterbar/src/admin-color-schemes/colors/light/colors.scss
View file

This file was deleted.

13 changes: 0 additions & 13 deletions projects/packages/masterbar/src/admin-color-schemes/colors/midnight/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,7 @@
@import 'node_modules/@automattic/color-studio/dist/color-variables.scss';
@import 'node_modules/@automattic/color-studio/dist/color-variables-rgb.scss';

$masterbar-background: #363b3f;
$menu-submenu-background: #26292c;
$text-color: #fff;
$highlight-color: #e14d43;
$base-color-rgb: rgb(54, 59, 63);
$nav-unification-sidebar-text-alternative: #fff;
$menu-highlight-text: #fff;

// Calypso color variables used in e.g. inline help
$color-primary: #e14d43; // Calypso --color-primary
$color-primary-dark: $studio-red-70; // Calypso --color-primary-dark
$color-primary-light: $studio-red-30; // Calypso --color-primary-light
$color-surface: $studio-white; // Calypso --color-surface
$color-neutral-100-rgb: $studio-gray-100-rgb; // Calypso --color-neutral-100-rgb

// Sidebar Nudges
$menu-nudge-background: $studio-white;
Expand Down
5 changes: 0 additions & 5 deletions projects/packages/masterbar/src/admin-color-schemes/colors/midnight/colors.scss
View file

This file was deleted.

13 changes: 0 additions & 13 deletions projects/packages/masterbar/src/admin-color-schemes/colors/modern/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,7 @@
@import 'node_modules/@automattic/color-studio/dist/color-variables.scss';
@import 'node_modules/@automattic/color-studio/dist/color-variables-rgb.scss';

$masterbar-background: #1e1e1e;
$menu-submenu-background: #0c0c0c;
$text-color: #fff;
$highlight-color: #3858e9;
$base-color-rgb: rgb(30, 30, 30);
$nav-unification-sidebar-text-alternative: #c3c4c7;
$menu-highlight-text: #fff;

// Calypso color variables used in e.g. inline help
$color-primary: #3858e9; // Calypso --color-primary
$color-primary-dark: $studio-blue-70; // Calypso --color-primary-dark
$color-primary-light: $studio-blue-30; // Calypso --color-primary-light
$color-surface: $studio-white; // Calypso --color-surface
$color-neutral-100-rgb: $studio-gray-100-rgb; // Calypso --color-neutral-100-rgb

// Sidebar Nudges
$menu-nudge-background: $studio-white;
Expand Down
5 changes: 0 additions & 5 deletions projects/packages/masterbar/src/admin-color-schemes/colors/modern/colors.scss
View file

This file was deleted.

13 changes: 0 additions & 13 deletions projects/packages/masterbar/src/admin-color-schemes/colors/ocean/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,7 @@
@import 'node_modules/@automattic/color-studio/dist/color-variables.scss';
@import 'node_modules/@automattic/color-studio/dist/color-variables-rgb.scss';

$masterbar-background: #738e96;
$menu-submenu-background: #627c83;
$text-color: #fff;
$highlight-color: #9ebaa0;
$base-color-rgb: rgb(115, 142, 150);
$nav-unification-sidebar-text-alternative: #fff;
$menu-highlight-text: #fff;

// Calypso color variables used in e.g. inline help
$color-primary: #9ebaa0; // Calypso --color-primary
$color-primary-dark: $studio-celadon-70; // Calypso --color-primary-dark
$color-primary-light: $studio-celadon-30; // Calypso --color-primary-light
$color-surface: $studio-white; // Calypso --color-surface
$color-neutral-100-rgb: $studio-gray-100-rgb; // Calypso --color-neutral-100-rgb

// Sidebar Nudges
$menu-nudge-background: $studio-white;
Expand Down
5 changes: 0 additions & 5 deletions projects/packages/masterbar/src/admin-color-schemes/colors/ocean/colors.scss
View file

This file was deleted.

13 changes: 0 additions & 13 deletions projects/packages/masterbar/src/admin-color-schemes/colors/sunrise/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,7 @@
@import 'node_modules/@automattic/color-studio/dist/color-variables.scss';
@import 'node_modules/@automattic/color-studio/dist/color-variables-rgb.scss';

$masterbar-background: #cf4944;
$menu-submenu-background: #be3631;
$text-color: #fff;
$highlight-color: #dd823b;
$base-color-rgb: rgb(207, 73, 68);
$nav-unification-sidebar-text-alternative: #f6f7f7;
$menu-highlight-text: #fff;

// Calypso color variables used in e.g. inline help
$color-primary: #dd823b; // Calypso --color-primary
$color-primary-dark: $studio-orange-70; // Calypso --color-primary-dark
$color-primary-light: $studio-orange-30; // Calypso --color-primary-light
$color-surface: $studio-white; // Calypso --color-surface
$color-neutral-100-rgb: $studio-gray-100-rgb; // Calypso --color-neutral-100-rgb

// Sidebar Nudges
$menu-nudge-background: $studio-white;
Expand Down
5 changes: 0 additions & 5 deletions projects/packages/masterbar/src/admin-color-schemes/colors/sunrise/colors.scss
View file

This file was deleted.

Loading

0 comments on commit 329c194

Please sign in to comment.