Skip to content

Commit

Permalink
Fix/my jetpack recommendation mobile styling (#40370)
Browse files Browse the repository at this point in the history
* Fix My Jetpack recommendation card styles on mobile

* changelog

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/12086585760

Upstream-Ref: Automattic/jetpack@1c1afdd
  • Loading branch information
IanRamosC authored and matticbot committed Nov 29, 2024
1 parent 1f67c9d commit 0e1eee8
Show file tree
Hide file tree
Showing 10 changed files with 102 additions and 94 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"automattic/jetpack-composer-plugin": "^4.0.0",
"automattic/jetpack-config": "^3.0.0",
"automattic/jetpack-connection": "^6.1.0",
"automattic/jetpack-my-jetpack": "^5.0.4",
"automattic/jetpack-my-jetpack": "^5.0.5-alpha",
"automattic/jetpack-sync": "^4.0.2",
"automattic/jetpack-status": "^5.0.1"
},
Expand Down
8 changes: 8 additions & 0 deletions jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [5.0.5-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

### Fixed
- Fix My Jetpack recommendation card styling on mobile

## [5.0.4] - 2024-11-28
### Added
- Added "Expired" & "Expires soon" statuses to My Jetpack product cards. [#39816]
Expand Down Expand Up @@ -1838,6 +1845,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Created package

[5.0.5-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.0.4...5.0.5-alpha
[5.0.4]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.0.3...5.0.4
[5.0.3]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.0.2...5.0.3
[5.0.2]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.0.1...5.0.2
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '1d4381175bc946f720d9');
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '4864b71bf8ea75492c3a');

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Initializer {
*
* @var string
*/
const PACKAGE_VERSION = '5.0.4';
const PACKAGE_VERSION = '5.0.5-alpha';

/**
* HTML container ID for the IDC screen on My Jetpack page.
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '5.0.4',
'ver' => '5.0.5-alpha1732890958',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand Down
56 changes: 28 additions & 28 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
"reference": "320a2f984da76282e4f8f8a65cbbf1b27514046d"
"reference": "577c65ccb49803d3a10ec56c3a0894a2df622815"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -63,7 +63,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "3221be194ca253e1511d0e7bc7a289663cfa6dab"
"reference": "b2c4b7fae9dfb7ae8af90638389a8cd9628f863f"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -131,7 +131,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "4c7e47501e9a3b22a1a628bf9b16d35bc70d4065"
"reference": "6884c32fbcb5a4e4e32fc00f58b45e9b6f9dcf39"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -203,7 +203,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "cdfaad4b4d965743a35c5d0ea53f142527083100"
"reference": "8959d2b7b70198f75acdf59613ec47b9680c5ca6"
},
"require": {
"composer-plugin-api": "^2.2",
Expand Down Expand Up @@ -274,7 +274,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
"reference": "0ba23473b953cf2ff77620d3fb7d8fd10a9f3a19"
"reference": "6048827622ec72cf14bc8db3f30c2264c18e1eb4"
},
"require": {
"automattic/jetpack-connection": "^6.1.0",
Expand Down Expand Up @@ -345,7 +345,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
"reference": "274596bc7bb386f6586958444714d374d2456674"
"reference": "9ce41a708ac6f56b7d8f4d4b5f188d81ddd766b2"
},
"require": {
"automattic/jetpack-boost-core": "^0.3.2",
Expand Down Expand Up @@ -424,7 +424,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "c8770d3739d4b7960b747af6ce1bc54a20daaab2"
"reference": "8a74977351377d906207a56694c79065755402f4"
},
"require": {
"composer-plugin-api": "^2.2",
Expand Down Expand Up @@ -487,7 +487,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "da44d60f0c8fbe56c8a14b73698404b1873b1971"
"reference": "06c7ce9f1dc6be5f39775fa0cd3e3055f169f648"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -562,7 +562,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "4d9518be10b1ef5a1b3200e8434daf571ae31723"
"reference": "c487b4979434f18e189fb165997ed4306d1870e7"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -655,7 +655,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "cd6e32bad2ef9235cd85f42482caf71327eada0c"
"reference": "d6fef1d1149a934653f1177dd6a512aed8ccfece"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -712,7 +712,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "4203f055dec0f51949978115d75224db9e220504"
"reference": "d9d96805ba3211d937c0505304a38fd35bcaf3a1"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -768,7 +768,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "a650bba7535a293bec61c8e22ef94e44cef8fd65"
"reference": "3bb05d3eb07fdedf5763e89ebf783d97e36dbc9a"
},
"require": {
"automattic/jetpack-connection": "^6.1.0",
Expand Down Expand Up @@ -846,7 +846,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "a00b0a76a3521c8c16076574a6f7b6cbafcbaa91"
"reference": "7c3687fde30be2dd59c58a70c6b62c94d5b27b3b"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -907,7 +907,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "b40c1642cab788b63da50f645116c1755254a573"
"reference": "b549c32272c8c3bec490b895859fcd20f1f8f59d"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -985,7 +985,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "8250623649f9721564e01d6d0ccab68b3a5e11f4"
"reference": "87c82023f49bbae5cc7daa6b433cdd2579993ee4"
},
"require": {
"automattic/jetpack-connection": "^6.1.0",
Expand Down Expand Up @@ -1050,7 +1050,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "834622ab21e4bb596210b653ea7379d9cfd657b8"
"reference": "7291bb0ad34c02f2c0ccdfd8d27165dbe6c2b22b"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1101,12 +1101,12 @@
},
{
"name": "automattic/jetpack-my-jetpack",
"version": "5.0.4",
"version_normalized": "5.0.4.0",
"version": "5.0.5-alpha.1732890958",
"version_normalized": "5.0.5.0-alpha1732890958",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "2e9a2fb8325c6621b3c379c896cb914795d1e5cd"
"reference": "565f0729b7b602aff6d15b2a397b5135aba4ae51"
},
"require": {
"automattic/jetpack-admin-ui": "^0.5.1",
Expand Down Expand Up @@ -1211,7 +1211,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "7aa08cd4d5c1d31d7903eda0a16e1925a33dcd0d"
"reference": "e8ecae5e1c3aa0626bcfeb2488ea55c0f97a6416"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1275,7 +1275,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "4c6c39aba3e0a069141938b58a2ca09b8470a4a9"
"reference": "0182721088d7793605375d6264e24eaad3e248ec"
},
"require": {
"automattic/jetpack-connection": "^6.1.0",
Expand Down Expand Up @@ -1346,7 +1346,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "e633739508e9858250e3e31bc295d099604c4dbd"
"reference": "4e976cb1311085db09c05a0b6151ed9575606238"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -1405,7 +1405,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
"reference": "081af51b3ae2315f3cbb5971da71bf83a1f771f5"
"reference": "4071563786435a5f73af676601dae5f96f6740a4"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1478,7 +1478,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "e1f87684606354866e976ae6121e378e0d185eba"
"reference": "4090ea6699165126fbfd4a5d104fdac3df577b4d"
},
"require": {
"automattic/jetpack-connection": "^6.1.0",
Expand Down Expand Up @@ -1556,7 +1556,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "3249d01dbe23608f15f0eb52a067e4754ca7dd70"
"reference": "d8dabcc80de7184eee5a9fe67e2667090f223378"
},
"require": {
"automattic/jetpack-status": "^5.0.1",
Expand Down Expand Up @@ -1614,7 +1614,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "e2e8718270300d5be4b2afafd7a95b709588e60d"
"reference": "fe89c7bef5fb24b2b489cb3ac9ddfcd4a305ff3f"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1671,7 +1671,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "7543a91aa336adbb88487d54b31ccd91f3a30bda"
"reference": "f4f8e018027c91b7e85cfab808d88dfd8b14d5b1"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -1738,7 +1738,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "f203ae6df08a3ab351ba2a46ba9e0aec55af0ec0"
"reference": "e3430af43cfe612596962be3e7def4ce10e7c6b6"
},
"require": {
"automattic/jetpack-connection": "^6.1.0",
Expand Down
Loading

0 comments on commit 0e1eee8

Please sign in to comment.