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.

Sign up for GitHub

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

Feat: Column block #1661

Merged
merged 170 commits into from
Apr 9, 2020
Merged

Feat: Column block #1661

Changes from 164 commits
Commits
Show all changes
170 commits
Select commit Hold shift + click to select a range
6a7b2a2
Add ref to gutenberg repo
lukewalczak Sep 10, 2019
93f60e5
Update ref
lukewalczak Sep 10, 2019
ae5db47
update ref
jbinda Sep 18, 2019
6e6843e
update ref
jbinda Sep 19, 2019
2278b75
update ref
jbinda Sep 19, 2019
5403b0e
update ref
jbinda Sep 20, 2019
5a16927
update ref
jbinda Sep 20, 2019
3401a26
update ref
jbinda Sep 20, 2019
c4249ad
update ref
jbinda Sep 20, 2019
3f2dd84
update ref
jbinda Sep 23, 2019
e7b6a88
update ref
jbinda Sep 24, 2019
33224a9
update ref
jbinda Sep 24, 2019
3cc2c36
update ref
jbinda Sep 27, 2019
2f8700a
update ref
jbinda Sep 27, 2019
d1f80b9
update ref
jbinda Sep 30, 2019
8782424
update ref
jbinda Oct 1, 2019
a4500fb
update ref
jbinda Oct 3, 2019
2101b9f
update ref
jbinda Oct 3, 2019
6ad2a9c
update-ref
jbinda Oct 8, 2019
653cb76
update-ref
jbinda Oct 8, 2019
4209f12
merge develop
jbinda Oct 8, 2019
07f26ba
update ref
jbinda Oct 8, 2019
149ee0a
update ref
jbinda Oct 8, 2019
037b389
update ref
jbinda Oct 9, 2019
324c588
update ref
jbinda Oct 10, 2019
a2ab990
merge develop
jbinda Oct 10, 2019
5d7df2e
update ref
jbinda Oct 11, 2019
8f67870
Merge remote-tracking branch 'origin/develop' into callstack/navigate…
jbinda Oct 11, 2019
1704f16
update ref
jbinda Oct 11, 2019
e325b7e
merge develop
jbinda Oct 14, 2019
798aeb4
merge develop
jbinda Oct 14, 2019
486793a
update ref
jbinda Oct 15, 2019
5c245c1
merge develop
jbinda Oct 15, 2019
099de94
Update ref after adding FloatingToolbar functionality
lukewalczak Oct 15, 2019
488f711
update ref
jbinda Oct 16, 2019
cf42f25
update ref
jbinda Oct 16, 2019
0cdbf5b
update ref
jbinda Oct 16, 2019
1799e2a
update ref
jbinda Oct 30, 2019
e05d41c
merge develop
jbinda Oct 30, 2019
8c0348d
update ref
jbinda Oct 30, 2019
673206e
update ref
jbinda Oct 31, 2019
c1a15b9
update ref
jbinda Oct 30, 2019
064f12c
update ref
jbinda Nov 5, 2019
0bae0d5
merge develop
jbinda Nov 5, 2019
388d32e
update ref
jbinda Nov 5, 2019
20781dc
adjust appender button color
jbinda Nov 6, 2019
c946afa
update ref
jbinda Nov 6, 2019
37da15e
update ref
jbinda Nov 6, 2019
d46aa64
merge develop
jbinda Nov 6, 2019
d2f46f4
update ref
jbinda Nov 6, 2019
84b854d
fix lint issue
jbinda Nov 6, 2019
a3aee33
merge develop
jbinda Nov 7, 2019
79bf3d9
update ref
jbinda Nov 7, 2019
6f60958
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Nov 7, 2019
f933d07
update ref to CR changes
jbinda Nov 13, 2019
35a30cf
update ref
jbinda Nov 15, 2019
a2f761d
Merge remote-tracking branch 'origin/develop' into callstack/navigate…
jbinda Nov 15, 2019
cdafa84
update ref
jbinda Nov 15, 2019
f2ed184
merge develop
jbinda Nov 15, 2019
2492f4e
merge develop
jbinda Nov 15, 2019
ff527b4
update ref
jbinda Nov 18, 2019
67672b9
Merge remote-tracking branch 'origin/develop' into callstack/navigate…
jbinda Nov 18, 2019
d498d14
update ref
jbinda Nov 18, 2019
ae08284
update develop
jbinda Nov 19, 2019
59528d9
update ref
jbinda Nov 19, 2019
1afebca
upddate ref
jbinda Nov 22, 2019
ad45c30
update ref
jbinda Nov 25, 2019
6469e46
update ref
jbinda Nov 25, 2019
97db10c
update ref
jbinda Nov 27, 2019
de5fa6c
update ref
jbinda Nov 27, 2019
2e3e201
update ref
jbinda Nov 28, 2019
944d650
merge develop
jbinda Nov 28, 2019
77ad69c
update ref
jbinda Nov 28, 2019
932d579
update ref
jbinda Nov 28, 2019
c7e166b
update ref
jbinda Nov 29, 2019
84915c7
merge develop
jbinda Nov 29, 2019
400f5cf
Merge remote-tracking branch 'origin/develop' into callstack/navigate…
jbinda Dec 2, 2019
c210998
update refs
jbinda Dec 3, 2019
347c02b
merge develop
jbinda Dec 3, 2019
aa7c6b7
update ref
jbinda Dec 3, 2019
da70bef
update ref
jbinda Dec 3, 2019
db8d4b5
Fix e2e tests
dratwas Dec 3, 2019
d2231a7
merge develop
jbinda Dec 4, 2019
8ceb7ad
update ref
jbinda Dec 4, 2019
8d8ef8b
update ref
jbinda Dec 4, 2019
32c5ff1
update ref
jbinda Dec 4, 2019
135a144
Merge branch 'callstack/navigate-down' of github.com:wordpress-mobile…
jbinda Dec 4, 2019
c4ada54
merge navigation-down
jbinda Dec 4, 2019
c8d2355
fix android a bit
dratwas Dec 4, 2019
c2697c5
Merge remote-tracking branch 'origin/callstack/navigate-down' into ca…
dratwas Dec 4, 2019
62cb82f
update ref
jbinda Dec 6, 2019
0c5a9d4
Merge branch 'callstack/navigate-down' of github.com:wordpress-mobile…
jbinda Dec 6, 2019
f76dec4
merge develop
jbinda Dec 6, 2019
4acd846
update ref
jbinda Dec 6, 2019
a4e6ba0
update colors
jbinda Dec 6, 2019
982c6f6
merge develop
jbinda Dec 6, 2019
adc6f8b
merge develop
jbinda Dec 8, 2019
35cadbe
merge navigate-down
jbinda Dec 9, 2019
c6a10ff
merge develop
jbinda Jan 7, 2020
6beb4f2
update ref
jbinda Jan 7, 2020
be8bad7
use patch-package to fix that - temporary
dratwas Jan 8, 2020
726d2c0
Merge branch 'develop' into fix/max-depth-patch-package
dratwas Jan 16, 2020
1a98243
merge develop
jbinda Jan 20, 2020
8375d37
Merge remote-tracking branch 'origin/fix/max-depth-patch-package' int…
jbinda Jan 21, 2020
6d80f40
merge develop
jbinda Jan 21, 2020
cc824e9
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Jan 27, 2020
0c5bf0d
update ref
jbinda Jan 27, 2020
de1aa9a
merge develop
jbinda Jan 30, 2020
8635a52
merge develop
jbinda Jan 31, 2020
b7dc83d
update ref
jbinda Feb 3, 2020
e97347e
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Feb 3, 2020
e209b18
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Feb 4, 2020
f2e7a58
update ref
jbinda Feb 4, 2020
f0a5da2
update ref
jbinda Feb 4, 2020
0338ae5
update ref to refactor
jbinda Feb 5, 2020
3467195
update ref
jbinda Feb 5, 2020
99e7555
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Feb 6, 2020
52f74b0
update ref
jbinda Feb 6, 2020
0fb71f0
update ref
jbinda Feb 9, 2020
0d1246d
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Feb 9, 2020
450b969
update ref
jbinda Feb 14, 2020
a3d1a73
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Feb 14, 2020
f44bdb4
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Feb 18, 2020
2caf080
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Feb 19, 2020
d5eeb5e
update ref
jbinda Feb 19, 2020
bf276da
update ref
jbinda Feb 19, 2020
42d6556
Merge branch 'develop' into callstack/column-block
jbinda Feb 20, 2020
4f7496e
update ref
jbinda Feb 21, 2020
86526f5
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Mar 5, 2020
cbe1cf7
update ref
jbinda Mar 5, 2020
a50a996
update ref
jbinda Mar 6, 2020
7f1abeb
update ref
jbinda Mar 6, 2020
81005dd
update ref
jbinda Mar 6, 2020
b6beace
update ref
jbinda Mar 6, 2020
c0f4f47
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Mar 10, 2020
a1855d5
update ref
jbinda Mar 10, 2020
d02bd9a
updfate ref
jbinda Mar 11, 2020
6ab9fc8
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Mar 12, 2020
62f6edd
updfate ref
jbinda Mar 12, 2020
9a3dfd9
update ref
jbinda Mar 12, 2020
3cee66c
update ref
jbinda Mar 12, 2020
a301bba
update ref
jbinda Mar 13, 2020
1125a8c
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Mar 13, 2020
bb7d3f0
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Mar 16, 2020
e8875ee
update ref
jbinda Mar 16, 2020
9098f9a
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Mar 16, 2020
5a6d0ff
update ref
jbinda Mar 19, 2020
7dc103f
update ref
jbinda Mar 19, 2020
838f010
update ref
jbinda Mar 19, 2020
7163611
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Mar 19, 2020
b17f2ad
update ref
jbinda Mar 19, 2020
3b4fdb2
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Mar 25, 2020
268143f
update ref
jbinda Mar 25, 2020
337b0b6
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Mar 25, 2020
482f30c
update ref
jbinda Mar 25, 2020
e83c5fa
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Mar 26, 2020
a0f314c
update ref
jbinda Mar 27, 2020
53e220a
update ref
jbinda Mar 27, 2020
2affd41
update ref
jbinda Mar 31, 2020
0f0bb70
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Apr 6, 2020
1068ad4
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Apr 6, 2020
2fb976d
update ref
jbinda Apr 6, 2020
c8bd033
update ref
jbinda Apr 8, 2020
2359f5a
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Apr 8, 2020
8cc8d8e
update ref to master (Column Block)
jbinda Apr 8, 2020
96d38d3
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Apr 8, 2020
833af1c
update RELEASE-NOTES.txt
jbinda Apr 8, 2020
f364249
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Apr 9, 2020
5a88c09
Merge remote-tracking branch 'origin/develop' into callstack/column-b…
jbinda Apr 9, 2020
d34565d
update ref
jbinda Apr 9, 2020
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
2 changes: 1 addition & 1 deletion gutenberg
Open in desktop
Submodule gutenberg updated 77 files
+1 −1 lib/patterns/its-time.json
+1 −1 lib/patterns/numbered-features.json
+90 −293 package-lock.json
+0 −1 packages/base-styles/_variables.scss
+1 −14 packages/block-editor/README.md
+19 −3 packages/block-editor/src/components/block-list/block.native.js
+37 −6 packages/block-editor/src/components/block-list/index.native.js
+14 −0 packages/block-editor/src/components/block-list/style.native.scss
+17 −7 packages/block-editor/src/components/block-mobile-toolbar/index.native.js
+92 −25 packages/block-editor/src/components/block-mover/index.native.js
+2 −1 packages/block-editor/src/components/button-block-appender/index.native.js
+1 −5 packages/block-editor/src/components/font-sizes/index.js
+1 −20 packages/block-editor/src/components/font-sizes/utils.js
+6 −1 packages/block-editor/src/components/inner-blocks/button-block-appender.js
+16 −0 packages/block-editor/src/components/inner-blocks/index.native.js
+6 −12 packages/block-editor/src/components/multi-select-scroll-into-view/index.js
+2 −4 packages/block-editor/src/components/observe-typing/index.js
+1 −23 packages/block-editor/src/components/page-template-picker/preview.native.js
+1 −1 packages/block-editor/src/components/page-template-picker/templates/contact.native.js
+1 −1 packages/block-editor/src/components/page-template-picker/templates/services.native.js
+70 −57 packages/block-editor/src/hooks/color.js
+0 −151 packages/block-editor/src/hooks/font-size.js
+0 −1 packages/block-editor/src/hooks/index.js
+50 −36 packages/block-editor/src/hooks/line-height.js
+34 −71 packages/block-editor/src/hooks/style.js
+17 −13 packages/block-editor/src/hooks/test/style.js
+7 −11 packages/block-library/src/button/edit.native.js
+4 −0 packages/block-library/src/button/style.scss
+1 −8 packages/block-library/src/buttons/style.scss
+119 −0 packages/block-library/src/column/edit.native.js
+36 −0 packages/block-library/src/column/editor.native.scss
+17 −0 packages/block-library/src/column/index.native.js
+280 −0 packages/block-library/src/columns/edit.native.js
+11 −0 packages/block-library/src/columns/editor.native.scss
+2 −0 packages/block-library/src/columns/style.scss
+3 −0 packages/block-library/src/group/edit.native.js
+4 −0 packages/block-library/src/group/style.scss
+0 −1 packages/block-library/src/heading/index.js
+13 −0 packages/block-library/src/heading/style.scss
+2 −0 packages/block-library/src/index.native.js
+3 −0 packages/block-library/src/media-text/style.scss
+1 −0 packages/block-library/src/navigation/style.scss
+6 −0 packages/block-library/src/paragraph/block.json
+12 −32 packages/block-library/src/paragraph/deprecated.js
+19 −16 packages/block-library/src/paragraph/edit.js
+1 −0 packages/block-library/src/paragraph/editor.scss
+1 −6 packages/block-library/src/paragraph/index.js
+17 −2 packages/block-library/src/paragraph/save.js
+6 −0 packages/block-library/src/paragraph/style.scss
+17 −18 packages/block-library/src/style.scss
+7 −7 packages/components/src/card/styles/card-styles.js
+1 −8 packages/components/src/mobile/bottom-sheet/cell.native.js
+0 −4 packages/components/src/mobile/bottom-sheet/cellStyles.ios.scss
+0 −1 packages/components/src/mobile/bottom-sheet/range-cell.native.js
+1 −0 packages/components/src/mobile/keyboard-aware-flat-list/index.ios.js
+5 −4 packages/components/src/mobile/readable-content-view/index.native.js
+0 −10 packages/e2e-test-utils/CHANGELOG.md
+0 −15 packages/e2e-test-utils/README.md
+0 −25 packages/e2e-test-utils/src/get-page-error.js
+0 −1 packages/e2e-test-utils/src/index.js
+0 −44 packages/e2e-test-utils/src/test/get-page-error.js
+0 −6 packages/e2e-test-utils/src/visit-admin-page.js
+1 −1 packages/e2e-tests/fixtures/blocks/core__heading__deprecated-3.serialized.html
+1 −1 packages/e2e-tests/specs/editor/blocks/__snapshots__/heading.test.js.snap
+1 −1 packages/e2e-tests/specs/editor/various/__snapshots__/font-size-picker.test.js.snap
+0 −99 packages/e2e-tests/specs/editor/various/is-typing.test.js
+1 −5 packages/edit-navigation/src/components/layout/style.scss
+1 −6 packages/edit-navigation/src/components/menu-editor/index.js
+2 −5 packages/edit-navigation/src/components/menu-editor/style.scss
+9 −10 packages/edit-navigation/src/components/menus-editor/style.scss
+0 −21 packages/editor/src/editor-styles.scss
+7 −7 packages/env/lib/download-source.js
+2 −1 packages/env/package.json
+13 −24 packages/project-management-automation/lib/first-time-contributor.js
+0 −1 packages/scripts/package.json
+5 −4 packages/scripts/utils/env.js
+49 −49 storybook/test/__snapshots__/index.js.snap