Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: changed

Update design of the sidebar upsell.
4 changes: 4 additions & 0 deletions projects/packages/admin-ui/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
],
"test-php": [
"@composer phpunit"
],
"watch": [
"Composer\\Config::disableProcessTimeout",
"pnpm run watch"
]
},
"repositories": [
Expand Down
1 change: 1 addition & 0 deletions projects/packages/admin-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"extends @wordpress/browserslist-config"
],
"devDependencies": {
"@automattic/jetpack-base-styles": "workspace:*",
"@automattic/jetpack-webpack-config": "workspace:*",
"@wordpress/browserslist-config": "6.42.0",
"sass-embedded": "1.97.3",
Expand Down
48 changes: 14 additions & 34 deletions projects/packages/admin-ui/src/admin-ui-upgrade-menu.scss
Original file line number Diff line number Diff line change
@@ -1,41 +1,21 @@
@use "@automattic/jetpack-base-styles/root-variables";

// Keep the slug in sync with `UPGRADE_MENU_SLUG` at class-admin-menu.php
$upgrade-menu-slug: jetpack-wpadmin-sidebar-free-plan-upsell-menu-item;
$upgrade-menu-default-color: #069e08;
$upgrade-menu-default-color-schemes: fresh, light, modern;
$upgrade-menu-special-color-schemes: (
coffee: #9ea476,
ectoplasm: #a3b745,
midnight: #e14d43,
);
#adminmenu li.jetpack-wpadmin-sidebar-free-plan-upsell-menu-item > a {

@mixin upgrade-menu-item-link-selector {
#adminmenu li.#{$upgrade-menu-slug} > a,
#adminmenu li.#{$upgrade-menu-slug} > a:hover {
@content;
&,
&:hover {
background: var(--jp-green-40) !important;
border-radius: var(--jp-border-radius) !important;
box-shadow: none !important;
color: var(--jp-white) !important;
margin: 2px 4px;
text-align: center;
text-wrap: balance;
}
}

@mixin upgrade-menu-item-theme-selector($theme) {
body.admin-color-#{$theme} #adminmenu li.#{$upgrade-menu-slug} > a,
body.admin-color-#{$theme} #adminmenu li.#{$upgrade-menu-slug} > a:hover {
@content;
&:hover {
background: var(--jp-green-30) !important;
}
}

@include upgrade-menu-item-link-selector {
font-weight: 600;
}

@each $theme in $upgrade-menu-default-color-schemes {

@include upgrade-menu-item-theme-selector($theme) {
color: $upgrade-menu-default-color !important;
}
}

@each $theme, $color in $upgrade-menu-special-color-schemes {

@include upgrade-menu-item-theme-selector($theme) {
color: $color !important;
}
}
5 changes: 2 additions & 3 deletions projects/packages/admin-ui/src/class-admin-menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -320,12 +320,11 @@ private static function maybe_add_upgrade_menu_item() {
? \Automattic\Jetpack\Redirect::get_url( self::UPGRADE_MENU_SLUG )
: self::UPGRADE_MENU_FALLBACK_URL;

$menu_title = esc_html__( 'Upgrade Jetpack', 'jetpack-admin-ui' )
. ' <span aria-hidden="true">↗</span>';
$menu_title = esc_html__( 'Upgrade Jetpack', 'jetpack-admin-ui' );

add_submenu_page(
'jetpack',
__( 'Upgrade Jetpack', 'jetpack-admin-ui' ),
$menu_title,
$menu_title,
'manage_options',
esc_url( $upgrade_url ),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: changed

Update design of the sidebar upsell.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: changed

Update design of the sidebar upsell.
6 changes: 5 additions & 1 deletion projects/plugins/backup/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: changed

Update design of the sidebar upsell.
6 changes: 5 additions & 1 deletion projects/plugins/beta/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: changed

Update design of the sidebar upsell.
6 changes: 5 additions & 1 deletion projects/plugins/boost/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: changed

Update design of the sidebar upsell.
6 changes: 5 additions & 1 deletion projects/plugins/classic-theme-helper-plugin/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: changed

Update design of the sidebar upsell.
6 changes: 5 additions & 1 deletion projects/plugins/inspect/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: other

Update design of the sidebar upsell.
6 changes: 5 additions & 1 deletion projects/plugins/jetpack/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: changed

Update design of the sidebar upsell.
6 changes: 5 additions & 1 deletion projects/plugins/mu-wpcom-plugin/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: changed

Update design of the sidebar upsell.
6 changes: 5 additions & 1 deletion projects/plugins/paypal-payment-buttons/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: changed

Update design of the sidebar upsell.
6 changes: 5 additions & 1 deletion projects/plugins/protect/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: changed

Update design of the sidebar upsell.
6 changes: 5 additions & 1 deletion projects/plugins/search/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: changed

Update design of the sidebar upsell.
Loading
Loading