Skip to content

Commit

Permalink
Merge branch 'master' into update/default-templates
Browse files Browse the repository at this point in the history
  • Loading branch information
jameskoster committed Nov 23, 2020
2 parents 99078c4 + 10c48e1 commit 554d353
Show file tree
Hide file tree
Showing 137 changed files with 4,177 additions and 1,472 deletions.
47 changes: 47 additions & 0 deletions .github/workflows/build-plugin-zip.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Build Gutenberg Plugin Zip

on:
pull_request:
paths-ignore:
- '**.md'
push:
branches: [master]
paths-ignore:
- '**.md'

jobs:
build:
name: Build Release Artifact
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@master

- 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

- name: Build Gutenberg plugin ZIP file
run: ./bin/build-plugin-zip.sh
env:
NO_CHECKS: 'true'

- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: gutenberg-plugin
path: ./gutenberg.zip
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ playground/dist
.cache
*.tsbuildinfo

# Report generated from jest-junit
# Report generated from tests
test/native/junit.xml

# Local overrides
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Returns the raw representation of all the keyboard combinations of a given short

_Parameters_

- _state_ `Object`: Global state.
- _name_ `string`: Shortcut name.

_Returns_
Expand All @@ -25,8 +24,7 @@ Returns the shortcut names list for a given category name.

_Parameters_

- _state_ `Object`: Global state.
- _name_ `string`: Category name.
- _categoryName_ `string`: Category name.

_Returns_

Expand All @@ -38,7 +36,6 @@ Returns the aliases for a given shortcut name.

_Parameters_

- _state_ `Object`: Global state.
- _name_ `string`: Shortcut name.

_Returns_
Expand All @@ -51,7 +48,6 @@ Returns the shortcut description given its name.

_Parameters_

- _state_ `Object`: Global state.
- _name_ `string`: Shortcut name.

_Returns_
Expand All @@ -64,7 +60,6 @@ Returns the main key combination for a given shortcut name.

_Parameters_

- _state_ `Object`: Global state.
- _name_ `string`: Shortcut name.

_Returns_
Expand All @@ -77,7 +72,6 @@ Returns a string representing the main key combination for a given shortcut name

_Parameters_

- _state_ `Object`: Global state.
- _name_ `string`: Shortcut name.
- _representation_ (unknown type): Type of representation (display, raw, ariaLabel).

Expand All @@ -97,23 +91,19 @@ Returns an action object used to register a new keyboard shortcut.

_Parameters_

- _get_ `Function`: Atom resover.
- _set_ `Function`: Atom updater.
- _config_ `WPShortcutConfig`: Shortcut config.

_Returns_

- `Object`: action.

<a name="unregisterShortcut" href="#unregisterShortcut">#</a> **unregisterShortcut**

Returns an action object used to unregister a keyboard shortcut.

_Parameters_

- _get_ `Function`: get atom value.
- _set_ `Function`: set atom value.
- _name_ `string`: Shortcut name.

_Returns_

- `Object`: action.


<!-- END TOKEN(Autogenerated actions|../../../../packages/keyboard-shortcuts/src/store/actions.js) -->
8 changes: 8 additions & 0 deletions docs/designers-developers/developers/themes/theme-json.md
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,14 @@ Each block declares which style properties it exposes. This has been coined as "
"link": "value",
"text": "value"
},
"spacing": {
"padding": {
"top": "value",
"right": "value",
"bottom": "value",
"left": "value",
},
},
"typography": {
"fontFamily": "value",
"fontSize": "value",
Expand Down
6 changes: 6 additions & 0 deletions docs/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -1793,6 +1793,12 @@
"markdown_source": "../packages/shortcode/README.md",
"parent": "packages"
},
{
"title": "@wordpress/stan",
"slug": "packages-stan",
"markdown_source": "../packages/stan/README.md",
"parent": "packages"
},
{
"title": "@wordpress/token-list",
"slug": "packages-token-list",
Expand Down
Loading

0 comments on commit 554d353

Please sign in to comment.