Skip to content

Commit

Permalink
Backports for 5.6 RC2 (#27366)
Browse files Browse the repository at this point in the history
* Provide a minimum of code wrapping for the code block. (#26623)

* Block Support: Fix font size style when applying block support (#26762)

* Fix Separator editor styles (#27071)

* Fix the Post author selector for contributors (#26554)

Co-authored-by: Riad Benguella <[email protected]>

* Align single half width column to left (#27142)

* remove the auto margin for individual column blocks

* update margin values for blocks in blocks to zero insted of auto

* Add backward compatibility support for lightBlockWrapper in getSaveElement (#27189)

* Code block: paste plain text (#27236)

* paste plain text option

* Add e2e test

* Fix crash when null date passed to TimePicker (#27316)

* Fix crash when null date passed.

* Update test

* Fix GH actions "cancel" step (#27025)

* use new syntax for setting env var

* Update package-lock

* Update package-lock again

* Remove the button only option from the UI until it can be wired up to something that works in the front end. (#27379)

* Fix combobox csuggestion list closure when clicking scrollbar (#27367)

Co-authored-by: Joen A <[email protected]>
Co-authored-by: Aaron Robertshaw <[email protected]>
Co-authored-by: Nik Tsekouras <[email protected]>
Co-authored-by: Adam Silverstein <[email protected]>
Co-authored-by: Riad Benguella <[email protected]>
Co-authored-by: andrei draganescu <[email protected]>
Co-authored-by: Daniel Richards <[email protected]>
Co-authored-by: Ella van Durpe <[email protected]>
Co-authored-by: Noah Allen <[email protected]>
Co-authored-by: Andy Peatling <[email protected]>
  • Loading branch information
11 people authored Dec 1, 2020
1 parent d2e301e commit 70774a1
Show file tree
Hide file tree
Showing 25 changed files with 1,529 additions and 768 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cancel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
timeout-minutes: 3
steps:
- name: Get all workflow ids and set to env variable
run: echo ::set-env name=WORKFLOW_IDS_TO_CANCEL::$(curl https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/workflows -s | jq -r '.workflows | map(.id|tostring) | join(",")')
run: echo "WORKFLOW_IDS_TO_CANCEL=$(curl https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/workflows -s | jq -r '.workflows | map(.id|tostring) | join(",")')" >> $GITHUB_ENV

- uses: styfle/[email protected]
with:
Expand Down
1 change: 1 addition & 0 deletions docs/designers-developers/developers/data/data-core.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Returns all available authors.
_Parameters_

- _state_ `Object`: Data state.
- _query_ `(Object|undefined)`: Optional object of query parameters to include with request.

_Returns_

Expand Down
2 changes: 1 addition & 1 deletion lib/block-supports/typography.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function gutenberg_apply_typography_support( $block_type, $block_attributes ) {
if ( $has_named_font_size ) {
$classes[] = sprintf( 'has-%s-font-size', $block_attributes['fontSize'] );
} elseif ( $has_custom_font_size ) {
$styles[] = sprintf( 'font-size: %spx;', $block_attributes['style']['typography']['fontSize'] );
$styles[] = sprintf( 'font-size: %s;', $block_attributes['style']['typography']['fontSize'] );
}
}

Expand Down
Loading

0 comments on commit 70774a1

Please sign in to comment.