Skip to content

Commit

Permalink
WP 5.6.2 backports (#29058)
Browse files Browse the repository at this point in the history
* Backport #26475 for the 5.6 branch.

* Backport #28604.

* Revert "Backport #28604."

This reverts commit 32784b6.

* Backport #26583 to the 5.6 branch.

* Commit lock file updates.

* Committing lock file differences after updating `browserslist`.

* Pin the version of NodeJS in the Compressed Size workflow.

* Memoize getEntityRecords to prevent infinite re-renders (#26447)

* Fix issue where gallery block requests all attachments when empty (#28621)

* Return early from building attachments for galleries

* Improve code clarity

* Fix link control styles to prevent scrollbar (#27777)

* Update package-lock

* Update package-lock again

Co-authored-by: Jonathan Desrosiers <desrosj@users.noreply.github.com>
Co-authored-by: Kai Hao <kevin830726@gmail.com>
Co-authored-by: Daniel Richards <daniel.richards@automattic.com>
Co-authored-by: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
  • Loading branch information
5 people authored Feb 17, 2021
1 parent 2ca15e8 commit 0886f88
Show file tree
Hide file tree
Showing 12 changed files with 1,202 additions and 7,005 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/bundle-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,24 @@ jobs:
with:
fetch-depth: 1

- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Use Node.js 12.x
uses: actions/setup-node@v1
with:
node-version: 12.x

- uses: preactjs/compressed-size-action@v1
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
Expand Down
6 changes: 6 additions & 0 deletions lib/global-styles.php
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,12 @@ function gutenberg_experimental_global_styles_get_theme_support_settings() {
$theme_settings['global']['settings']['typography'] = array();
}
$theme_settings['global']['settings']['typography']['fontSizes'] = array();
// Back-compatibility for presets without units.
foreach ( $theme_font_sizes[0] as &$font_size ) {
if ( is_numeric( $font_size['size'] ) ) {
$font_size['size'] = $font_size['size'] . 'px';
}
}
$theme_settings['global']['settings']['typography']['fontSizes'] = $theme_font_sizes[0];
}

Expand Down
Loading

0 comments on commit 0886f88

Please sign in to comment.