Skip to content

Commit 7f0cd31

Browse files
authored
Sidebar upsell nudge: update visually (#47909)
1 parent 5a327ce commit 7f0cd31

38 files changed

+172
-53
lines changed

pnpm-lock.yaml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: minor
2+
Type: changed
3+
4+
Update design of the sidebar upsell.

projects/packages/admin-ui/composer.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
],
3939
"test-php": [
4040
"@composer phpunit"
41+
],
42+
"watch": [
43+
"Composer\\Config::disableProcessTimeout",
44+
"pnpm run watch"
4145
]
4246
},
4347
"repositories": [

projects/packages/admin-ui/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"extends @wordpress/browserslist-config"
2626
],
2727
"devDependencies": {
28+
"@automattic/jetpack-base-styles": "workspace:*",
2829
"@automattic/jetpack-webpack-config": "workspace:*",
2930
"@wordpress/browserslist-config": "6.42.0",
3031
"sass-embedded": "1.97.3",
Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,21 @@
1+
@use "@automattic/jetpack-base-styles/root-variables";
2+
13
// Keep the slug in sync with `UPGRADE_MENU_SLUG` at class-admin-menu.php
2-
$upgrade-menu-slug: jetpack-wpadmin-sidebar-free-plan-upsell-menu-item;
3-
$upgrade-menu-default-color: #069e08;
4-
$upgrade-menu-default-color-schemes: fresh, light, modern;
5-
$upgrade-menu-special-color-schemes: (
6-
coffee: #9ea476,
7-
ectoplasm: #a3b745,
8-
midnight: #e14d43,
9-
);
4+
#adminmenu li.jetpack-wpadmin-sidebar-free-plan-upsell-menu-item > a {
105

11-
@mixin upgrade-menu-item-link-selector {
12-
#adminmenu li.#{$upgrade-menu-slug} > a,
13-
#adminmenu li.#{$upgrade-menu-slug} > a:hover {
14-
@content;
6+
&,
7+
&:hover {
8+
background: var(--jp-green-40) !important;
9+
border-radius: var(--jp-border-radius) !important;
10+
box-shadow: none !important;
11+
color: var(--jp-white) !important;
12+
margin: 2px 4px;
13+
text-align: center;
14+
text-wrap: balance;
1515
}
16-
}
1716

18-
@mixin upgrade-menu-item-theme-selector($theme) {
19-
body.admin-color-#{$theme} #adminmenu li.#{$upgrade-menu-slug} > a,
20-
body.admin-color-#{$theme} #adminmenu li.#{$upgrade-menu-slug} > a:hover {
21-
@content;
17+
&:hover {
18+
background: var(--jp-green-30) !important;
2219
}
23-
}
24-
25-
@include upgrade-menu-item-link-selector {
26-
font-weight: 600;
27-
}
28-
29-
@each $theme in $upgrade-menu-default-color-schemes {
3020

31-
@include upgrade-menu-item-theme-selector($theme) {
32-
color: $upgrade-menu-default-color !important;
33-
}
34-
}
35-
36-
@each $theme, $color in $upgrade-menu-special-color-schemes {
37-
38-
@include upgrade-menu-item-theme-selector($theme) {
39-
color: $color !important;
40-
}
4121
}

projects/packages/admin-ui/src/class-admin-menu.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,12 +320,11 @@ private static function maybe_add_upgrade_menu_item() {
320320
? \Automattic\Jetpack\Redirect::get_url( self::UPGRADE_MENU_SLUG )
321321
: self::UPGRADE_MENU_FALLBACK_URL;
322322

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

326325
add_submenu_page(
327326
'jetpack',
328-
__( 'Upgrade Jetpack', 'jetpack-admin-ui' ),
327+
$menu_title,
329328
$menu_title,
330329
'manage_options',
331330
esc_url( $upgrade_url ),
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: minor
2+
Type: changed
3+
4+
Update design of the sidebar upsell.

projects/plugins/automattic-for-agencies-client/composer.lock

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: minor
2+
Type: changed
3+
4+
Update design of the sidebar upsell.

projects/plugins/backup/composer.lock

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)