Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set base typographic rhythm #2369

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
1.31.0
------
* [**] More spacious basic typographic rhythm

1.30.0
------
* [**] Adds editor support for theme defined colors and theme defined gradients on cover and button blocks.
Expand Down
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 96 files
+11 −11 docs/contributors/release.md
+3 −3 docs/designers-developers/developers/data/data-core-block-editor.md
+3 −0 docs/designers-developers/developers/tutorials/block-tutorial/block-controls-toolbar-and-sidebar.md
+0 −41 lib/class-wp-block-patterns-registry.php
+15 −0 lib/client-assets.php
+0 −21 lib/compat.php
+64 −0 lib/edit-site-export.php
+2 −2 lib/edit-site-page.php
+10 −9 lib/global-styles.php
+1 −0 lib/load.php
+68 −54 lib/template-loader.php
+45 −3 lib/template-parts.php
+9 −3 package-lock.json
+2 −3 packages/block-editor/src/components/block-controls/index.js
+2 −1 packages/block-editor/src/components/block-draggable/index.js
+6 −1 packages/block-editor/src/components/block-inspector/index.js
+7 −7 packages/block-editor/src/components/block-list/block-wrapper.js
+16 −3 packages/block-editor/src/components/block-list/block.js
+78 −2 packages/block-editor/src/components/block-list/style.scss
+8 −4 packages/block-editor/src/components/block-mover/button.js
+0 −41 packages/block-editor/src/components/block-mover/icons.js
+30 −39 packages/block-editor/src/components/block-mover/index.js
+2 −15 packages/block-editor/src/components/block-mover/style.scss
+33 −24 packages/block-editor/src/components/block-navigation/block.js
+10 −6 packages/block-editor/src/components/block-navigation/branch.js
+103 −7 packages/block-editor/src/components/block-navigation/style.scss
+4 −4 packages/block-editor/src/components/block-parent-selector/style.scss
+4 −1 packages/block-editor/src/components/block-switcher/style.scss
+34 −40 packages/block-editor/src/components/block-toolbar/index.js
+24 −35 packages/block-editor/src/components/block-toolbar/style.scss
+1 −108 packages/block-editor/src/components/gradients/index.js
+2 −0 packages/block-editor/src/components/gradients/index.native.js
+108 −0 packages/block-editor/src/components/gradients/use-gradient.js
+9 −0 packages/block-editor/src/components/gradients/with-gradient.js
+1 −5 packages/block-editor/src/components/inner-blocks/index.js
+2 −3 packages/block-editor/src/components/inspector-controls/index.js
+9 −0 packages/block-editor/src/components/media-placeholder/README.md
+3 −0 packages/block-editor/src/components/media-placeholder/index.js
+5 −1 packages/block-editor/src/components/media-replace-flow/README.md
+5 −1 packages/block-editor/src/components/media-replace-flow/index.js
+38 −0 packages/block-editor/src/components/use-display-block-controls/index.js
+11 −27 packages/block-editor/src/components/use-moving-animation/index.js
+9 −4 packages/block-editor/src/hooks/color.js
+22 −6 packages/block-editor/src/hooks/padding.js
+10 −4 packages/block-editor/src/hooks/style.js
+6 −6 packages/block-editor/src/store/actions.js
+47 −29 packages/block-editor/src/store/reducer.js
+13 −2 packages/block-editor/src/store/test/actions.js
+21 −21 packages/block-editor/src/store/test/reducer.js
+2 −3 packages/block-library/src/button/edit.native.js
+4 −1 packages/block-library/src/cover/edit.js
+21 −27 packages/block-library/src/image/edit.js
+1 −1 packages/block-library/src/navigation/block-navigation-list.js
+39 −0 packages/block-library/src/navigation/create-data-tree.js
+312 −44 packages/block-library/src/navigation/edit.js
+63 −0 packages/block-library/src/navigation/style.scss
+23 −18 packages/block-library/src/rich-image/rich-image/index.js
+8 −1 packages/components/src/box-control/README.md
+25 −2 packages/components/src/box-control/all-input-control.js
+28 −9 packages/components/src/box-control/index.js
+18 −0 packages/components/src/box-control/input-controls.js
+7 −1 packages/components/src/box-control/stories/index.js
+17 −1 packages/components/src/box-control/unit-control.js
+40 −5 packages/components/src/box-control/utils.js
+20 −15 packages/components/src/box-control/visualizer.js
+1 −1 packages/components/src/custom-select-control/README.md
+1 −0 packages/components/src/custom-select-control/index.js
+1 −0 packages/components/src/custom-select-control/stories/index.js
+0 −1 packages/components/src/custom-select-control/style.scss
+10 −2 packages/components/src/draggable/index.js
+7 −2 packages/components/src/draggable/style.scss
+1 −0 packages/components/src/index.js
+1 −2 packages/components/src/toolbar/style.scss
+11 −3 packages/components/src/tree-grid/cell.js
+1 −0 packages/components/src/tree-grid/index.js
+8 −0 packages/components/src/tree-grid/item.js
+0 −11 packages/e2e-tests/specs/editor/blocks/image.test.js
+0 −3 packages/e2e-tests/specs/editor/plugins/templates.test.js
+10 −0 packages/e2e-tests/specs/editor/various/__snapshots__/multi-block-selection.test.js.snap
+0 −2 packages/e2e-tests/specs/editor/various/adding-blocks.test.js
+0 −4 packages/e2e-tests/specs/editor/various/block-deletion.test.js
+5 −4 packages/e2e-tests/specs/editor/various/keyboard-navigable-blocks.test.js
+14 −0 packages/e2e-tests/specs/editor/various/multi-block-selection.test.js
+50 −4 packages/e2e-tests/specs/experiments/__snapshots__/navigation.test.js.snap
+1,357 −0 packages/e2e-tests/specs/experiments/fixtures/menu-items-response-fixture.json
+288 −50 packages/e2e-tests/specs/experiments/navigation.test.js
+67 −5 packages/edit-navigation/README.md
+1 −1 packages/edit-navigation/src/components/menu-editor/index.js
+16 −1 packages/edit-navigation/src/components/menu-editor/style.scss
+1 −0 packages/edit-site/package.json
+0 −8 packages/edit-site/src/components/header/index.js
+56 −45 packages/edit-site/src/components/template-switcher/index.js
+29 −0 packages/edit-site/src/plugins/index.js
+1 −0 packages/editor/src/components/provider/index.js
+10 −1 packages/rich-text/src/component/index.native.js
+2 −0 packages/rich-text/src/component/style.native.scss
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,14 @@ public void setFontStyle(ReactAztecText view, @Nullable String fontStyleString)
}
}

@ReactProp(name = ViewProps.LINE_HEIGHT, defaultInt = ViewDefaults.LINE_HEIGHT)
public void setLineHeight(ReactAztecText view, int lineHeight) {
// setLineHeight is not available on API 21 (the current app minimum) so,
// go with setLineSpacing instead, by using this formula:
// (font-size) * (line-height multiplier) = (line-height value)
view.setLineSpacing(0, 1.0f * lineHeight / PixelUtil.toSPFromPixel(view.getTextSize()));
}

/**
* This code was taken from the method parseNumericFontWeight of the class ReactTextShadowNode
* TODO: Factor into a common place they can both use
Expand Down