[amp-stories sub-task] Grid layers layout #1347

miina · 2018-08-20T13:59:29Z

This is a sub-PR of #1215 and should be merged to that PR.

The goal of this PR is to creating user interface for being able to edit AMP Story Grid Layers on top of each other within Gutenberg editor, using CSS Grid to lay out the blocks inside, and build the control for selecting a given layer.

…op layers if a lower one is selected.

miina · 2018-08-21T15:07:37Z

blocks/amp-story/block-selector.js

+						e.stopPropagation();
+						if ( getSelectedBlock.clientId !== block.clientId ) {
+							// @todo This selects the first inner child instead for some reason.
+							selectBlock( block.clientId );


@westonruter For some reason selectBlock here is triggering selectBlock for its first inner block, too, and ends up selecting the first inner block of the layer (e.g. the first paragraph within the layer block) instead of the layer itself. Any thoughts on why this might happen? (If not, I'll just continue looking into it, perhaps it's an issue to report.)

I don't know why. Is this why I am unable to insert a grid layer upon selecting the page?

westonruter · 2018-08-21T15:17:51Z

blocks/amp-story/block-selector.js

+			let blockType = getBlockType( block.name );
+			links.push(
+				<li className={ className } key={ 'selector-' + index }>
+					<a onClick={ ( e ) => {


Let's have this be a button so that it can be focused and accessible.

westonruter · 2018-08-21T15:18:19Z

blocks/amp-story/block-selector.js

+			<li className={ className } key='page-selector'>
+				<a onClick={ () => {
+					selectBlock( this.props.rootClientId );
+				}}>Page</a>


“Page” here needs to be translatable.

westonruter · 2018-08-21T15:20:48Z

blocks/amp-story/block-selector.js

+							// @todo This selects the first inner child instead for some reason.
+							selectBlock( block.clientId );
+						}
+					}}>{ blockType.title }</a>


This can just be “Layer” perhaps. In the end, I don't think that we'll be displaying the label and that we'd just have an icon instead, with perhaps a tooltip.

westonruter · 2018-08-21T15:21:09Z

blocks/amp-story/block-selector.js

+
+		links.push(
+			<li className={ className } key='page-selector'>
+				<a onClick={ () => {


Per above, this should be button.

westonruter · 2018-08-21T15:24:31Z

blocks/amp-story/block-selector.js

+						e.stopPropagation();
+						if ( getSelectedBlock.clientId !== block.clientId ) {
+							// @todo This selects the first inner child instead for some reason.
+							selectBlock( block.clientId );


I don't know why. Is this why I am unable to insert a grid layer upon selecting the page?

westonruter · 2018-08-21T15:25:23Z

blocks/amp-story/block-selector.js

+		);
+
+		return (
+			<ul className="editor-selectors">


This should probably be an ol since the layers are ordered.

westonruter · 2018-08-21T15:28:57Z

assets/css/amp-editor-story-blocks.css

-	background-color: #ffdddd;
+div[data-type="amp/amp-story-page"],
+div[data-type="amp/amp-story-page"] .editor-inner-blocks .editor-block-list__layout {
+	min-height: 450px;


On desktop an AMP story has the following style rule:

[desktop]>amp-story-page { margin: auto!important; max-height: 75vh!important; max-width: 45vh!important; min-width: 320px!important; min-height: 533px!important; }

Would that ensure that the page is displayed with the right aspect ratio and dimensions?

… amp-story/layouts

…ch other and make more similar to amp-story design in browser.

…media loader.

miina · 2018-08-22T18:44:29Z

blocks/amp-story/block-selector.js

+		// @todo Creating a custom inserter since the default inserter doesn't allow taking the root client ID dynamically. Change if that becomes available.
+		return (
+			<ul className="editor-selectors">
+				<LayerInserter { ...inserterProps }/>


Added a custom block inserter which just displays the relevant items in the list since it looks like the default Inserter is automatically taking the clientId of the selected block and then inserts a block after that. Since the list of layouts is fixed with the page block then this would mean that the inserter would always take the amp-story-page as the selected block and thus add the new block to the root level instead of inside the AMP Story page block (since the inserter inserts AFTER the selected block by default).

We could potentially create another issue in Gutenberg repo for allowing the Inserter to also accept the selected block ID as a param, however, it's likely not the most pressing issue right now and might take some time to get implemented.

(As of now) the custom inserter basically just displays the allowed blocks and that's it:

@westonruter Do you have any thoughts on if this makes sense for now?

That sounds good!

miina · 2018-08-29T13:12:50Z

blocks/amp-story/block-selector.js

+						let timeout = 50;
+						setTimeout( function() {
+							selectBlock( block.clientId );
+						}, timeout );


Looks like using selectBlock a second time with timeout results in selecting the correct block eventually, however, there is another issue as well. Noticed that not the first inner child is selected but the first inner text block is selected. For example if the Grid Layer only has one Image block as the inner child and then selectBlock is used then a paragraph block is automatically created within this Grid Layer.

We should definitely look into the issues with selectBlock / alternatives at some moment ourselves.

miina · 2018-08-29T13:21:01Z

@westonruter The PR of adding the control for selecting layers and using CSS grid for the inner blocks is ready for review now. There are some things that still need improving but maybe is better to do later / separately:

selectBlock not working as expected but added a temporary workaround;
Styling fixes -- maybe that's better to do when other pieces are also in place, such as the icons, amp-story-page background color selection etc.;

westonruter · 2018-08-29T16:30:22Z

@miina would you update to fix the merge conflicts introduced by merging #1380?

miina · 2018-08-29T16:42:19Z

@westonruter Done!

…emplate

westonruter · 2018-08-29T19:22:57Z

@miina There is a styling discrepancy between the editor and the frontend in how a block is laid out in a layer, but we can address this later:

Backend

Frontend

westonruter · 2018-08-29T19:25:23Z

@miina also, the block toolbar is getting mostly hidden:

We might want to consider forcing the toolbar to be fixed to the top in AMP stories:

…tion See PR #1215. Shortlog of committers as part of squash: 149 Miina Sikk (@miina) 65 Mike Crantea (@mehigh) 33 Weston Ruter (@westonruter) 29 Jacob Schweitzer (jacobschweitzer) 4 Shannon MacMillan (@bluestormcreative) Squashed commit of the following: commit 95507fa1c6d3f90344158303c5a25701e282a092 Merge: e7ee2343 ee22bab5 Author: Weston Ruter <westonruter@google.com> Date: Tue Feb 19 19:07:18 2019 -0800 Merge branch 'develop' of github.com:ampproject/amp-wp into amp-stories * 'develop' of github.com:ampproject/amp-wp: (45 commits) phpcs adjustments Use reflection to test filters for all template types Borrow regex from get_query_template() Add required phpunit testsuite name Update dependency dealerdirect/phpcodesniffer-composer-installer to v0.5.0 Update Webpack to v4, install webpack-cli Updaste sniff names Undo renaming of phpcs:ignore comment Use version 2.0 of WPCS Use esc_html__() instead of esc_html_e() Fix OutputNotEscaped phpcs issue Prevent false positives for translator comments by adjusting the threshold for commented out code Fix printf call Add missing argument to sprintf Remove string concatenation and make docs URLs translatable Save previously unsaved changes... Use placeholders for available_callback Another instance of missing esc_html__ Add back esc_html__() Various improvements to translatable strings ... commit e7ee23434dab36bf734332fce03b720289e42e44 Merge: 0dc42bdb 28f4ceff Author: Weston Ruter <westonruter@google.com> Date: Mon Feb 11 22:03:23 2019 +0100 Merge pull request #1614 from ampproject/1569-compatibility_issues [amp-stories sub-task] Sanitize AMP Stories. commit 28f4ceffb5c902333db4f89c86cfab4a0b81ba02 Merge: f9da69f1 0dc42bdb Author: Weston Ruter <westonruter@google.com> Date: Mon Feb 11 21:49:20 2019 +0100 Merge branch 'amp-stories' into 1569-compatibility_issues * amp-stories: (195 commits) Fix phpcs complaints re: NotInFooter and MultipleArguments Simplify logic for remove_disallowed_descendants Fix disallowed descendant validation; add child count validation Flesh-out amp-accordion test case Account for changes to protobuf objects in amphtml-update.py Refactor how amphtml-update is invoked; fix serialization problem Bump amphtml to 1811202257200 with spec revision 767 Install amphtml as composer dev-dependency pinned at a release version Improve child node iteration in remove_disallowed_descendants; add failing tests which show areas needing attention Fix iteration of live node list in remove_disallowed_children; add tests Fix amp-accordion tests. Remove todo note. Update logic to match the new generated tags structure. Update python script. Use remove_invalid_child instead of just removing the node. Add child_tags tags spec. Add check for existing child nodes. Implement allowed_descendant_tags Exclude duplicate stylesheets from amp-custom style manifest Use more 301 redirects between AMP/non-AMP URLs for non-admin users ... commit 0dc42bdb60001ce1677fc8cc3332a850c33912ca Author: Weston Ruter <westonruter@google.com> Date: Mon Feb 11 21:37:31 2019 +0100 Fix phpcs complaints re: NotInFooter and MultipleArguments commit 9fb5e20d9da87428857a02dcdf41a4b7d4b837f2 Merge: 70f0d83c ff06ada3 Author: Weston Ruter <westonruter@google.com> Date: Mon Feb 11 18:14:27 2019 +0100 Merge branch 'develop' of github.com:ampproject/amp-wp into amp-stories * 'develop' of github.com:ampproject/amp-wp: (141 commits) Simplify logic for remove_disallowed_descendants Fix disallowed descendant validation; add child count validation Flesh-out amp-accordion test case Account for changes to protobuf objects in amphtml-update.py Refactor how amphtml-update is invoked; fix serialization problem Bump amphtml to 1811202257200 with spec revision 767 Install amphtml as composer dev-dependency pinned at a release version Improve child node iteration in remove_disallowed_descendants; add failing tests which show areas needing attention Fix iteration of live node list in remove_disallowed_children; add tests Fix amp-accordion tests. Remove todo note. Update logic to match the new generated tags structure. Update python script. Use remove_invalid_child instead of just removing the node. Add child_tags tags spec. Add check for existing child nodes. Implement allowed_descendant_tags Exclude duplicate stylesheets from amp-custom style manifest Use more 301 redirects between AMP/non-AMP URLs for non-admin users Rename CODE_OF_CONDUCT.md to code_of_conduct.md for consistency ... commit 70f0d83c0cf5213637d17c37ca59bc7940071408 Merge: f49b41b9 f9e5fd8a Author: Miina <miina.sikk@gmail.com> Date: Thu Dec 13 16:36:50 2018 -0300 Merge pull request #1713 from ampproject/amp-story/1643 1643: Add font family option and CSS commit f9e5fd8a2406ba50773c7147464478d91954bbb6 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Dec 13 15:09:39 2018 -0300 Add fonts only to text blocks. Refactor code. commit 32de04290ca8f55909b01460e6edd7f275fc06ee Merge: 844dab21 f49b41b9 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Dec 13 14:36:51 2018 -0300 Merge remote-tracking branch 'origin/amp-stories' into amp-story/1643 commit f49b41b9453da349eb48da8c1b6e2503f7a154e5 Merge: b965172a efd1d075 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Dec 13 14:36:14 2018 -0300 Merge remote-tracking branch 'origin/develop' into amp-stories commit 844dab219fce0aa472b25ee88f7c69373f83c4d0 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Dec 12 19:53:46 2018 -0300 Fix CS issues. Refactor code. commit bd24ab82abea745f782dec6e5a5222ec9bc4dff8 Author: Jacob Schweitzer <allambition@gmail.com> Date: Sat Dec 8 09:39:30 2018 -0200 1643: Make function static commit 813f4f9c54d19a1ddd3e4038362462130332e5be Author: Jacob Schweitzer <allambition@gmail.com> Date: Sat Dec 8 09:37:42 2018 -0200 1643: Fix translation function call for WP 5.0 commit 2397f022249a9ef4ac0f21f1fecb1465f1502bab Author: Jacob Schweitzer <allambition@gmail.com> Date: Sat Dec 8 09:30:36 2018 -0200 1643: Add data-font-family attribute in editor commit 6d6668de63f0cb0dc7b74fe554f5a6ca6e83860c Merge: 1f04ada1 8f7a60ac Author: Jacob Schweitzer <allambition@gmail.com> Date: Fri Dec 7 20:03:57 2018 -0200 Merge remote-tracking branch 'AMPProject/develop' into amp-story/1643 commit 1f04ada1717a0ff87f51c65a77d3e4f43a836a7a Author: Jacob Schweitzer <allambition@gmail.com> Date: Fri Dec 7 19:30:36 2018 -0200 1643: Enqueue CSS in admin to show font changes commit 2adac6f399a199f547acb80db7e9d812ad2fb9c2 Author: Jacob Schweitzer <allambition@gmail.com> Date: Thu Dec 6 16:57:53 2018 -0200 1643: Add font family option and frontend CSS commit b965172a6e268b01f52131a7d5dceb5ecd0c5670 Merge: b3d1b503 8189af28 Author: Miina <miina.sikk@gmail.com> Date: Tue Dec 4 19:02:19 2018 -0300 Merge pull request #1706 from Automattic/amp-story/fix-wrapper-filter [amp-stories sub-task] Fix wrapper filter. commit 8189af281cd593cab7add417e3d682cd0617330d Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Dec 4 18:56:05 2018 -0300 Fix wrapper filter. commit b3d1b503730514e2d12754d3d81793c9b8268d72 Merge: 117c70a8 4b32fa76 Author: Miina <miina.sikk@gmail.com> Date: Tue Dec 4 18:19:00 2018 -0300 Merge pull request #1702 from Automattic/amp-story/1696-fix_blurring_issue [amp-stories sub-task] Rework wrapper filter logic. commit 4b32fa7638ea022caf5a09e2b95862b6ff53ec5b Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Dec 4 17:15:24 2018 -0300 Add temporary fix for displaying Add Layer inserter. commit 56b6a96d1cf432d12d8cff6300a583962376c726 Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Dec 4 16:50:58 2018 -0300 Rework filtering wrapper properties. commit 117c70a8840a1c9b9e2800a1da36693ba9f5da01 Merge: 5f342911 8bda373e Author: Miina <miina.sikk@gmail.com> Date: Mon Dec 3 15:59:05 2018 -0300 Merge pull request #1690 from Automattic/1688-issues_with_animation Fix issues with selectors. commit 8bda373e86fd837ec58a73cb0a470725dc041a50 Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Dec 3 14:59:33 2018 -0300 Update selector for image block. commit f9da69f1d40b8c84c8c96b27403a8d3c4613cee0 Merge: c3a304a8 5f342911 Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Dec 3 11:10:24 2018 -0300 Merge remote-tracking branch 'origin/amp-stories' into 1569-compatibility_issues commit 5f342911be815e2c67c697d21dfdfead1f063493 Merge: 6348fddf 32703d69 Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Dec 3 11:10:01 2018 -0300 Merge remote-tracking branch 'origin/develop' into amp-stories commit 6348fddf3c32320674c5c44df0005634eb673d09 Merge: db1b45ae 21669e10 Author: Weston Ruter <westonruter@google.com> Date: Fri Nov 30 11:20:13 2018 -0800 Merge pull request #1678 from Automattic/amp-story/refix_setting_types [amp-stories] Fit settings types, again. commit 21669e1005671ed2a672adb9a6831d1b3a67321a Author: Weston Ruter <westonruter@google.com> Date: Fri Nov 30 11:13:27 2018 -0800 Fix tests which broke with Gutenberg 4.6 commit 8c35525829edcafcdceaa8d02b21ca8abc5877a8 Author: Weston Ruter <westonruter@google.com> Date: Fri Nov 30 11:12:58 2018 -0800 Revert "Only test up to WP 5.0; omit trunk since in flux" This reverts commit 6f9845d54609a756b12f4a367446359e8325382a. commit 6f9845d54609a756b12f4a367446359e8325382a Author: Weston Ruter <westonruter@google.com> Date: Fri Nov 30 10:01:44 2018 -0800 Only test up to WP 5.0; omit trunk since in flux commit c3a304a834d0fd942b5699006a0c4eb47a575eaa Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 30 13:43:01 2018 -0300 Fix amp-accordion tests. commit c31f2e44252ce9c6e024c089f30bc76bb96fcdb4 Merge: 0d6ef218 db1b45ae Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 30 13:02:19 2018 -0300 Merge remote-tracking branch 'origin/amp-stories' into 1569-compatibility_issues commit 4dae11a8bff59b29d6f2708356f8ddd5c4bd88be Merge: f44f7adc db1b45ae Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 30 13:01:46 2018 -0300 Merge remote-tracking branch 'origin/amp-stories' into amp-story/refix_setting_types commit db1b45ae3bb477ae161e9014acd4c281bca300fe Merge: bef58223 895c7314 Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 30 12:59:05 2018 -0300 Merge branch '1.0' into amp-stories commit f44f7adc115d2956f1c4020286a14efcf1e7e041 Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 30 12:19:43 2018 -0300 Fix setting types again. commit bef58223d940b8e23adb155fc3b162ddca2bf2be Merge: f6e4b6ab 48f66cc4 Author: Mike Crantea <mehigh@users.noreply.github.com> Date: Thu Nov 29 23:20:12 2018 +0200 Merge pull request #1675 from Automattic/amp-story/1673-polish 1673 - AMP stories Interface fixes and enhancements for the Demo commit 48f66cc42f504df62e25ce375e4280bef4ef2fe7 Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 29 23:11:58 2018 +0200 1673 - Implement mover arrows staying visible on the selected element commit f6e4b6ab03464d6d45498a033d230d530e495540 Merge: 7c5f4503 a51d3957 Author: Miina <miina.sikk@gmail.com> Date: Thu Nov 29 16:51:35 2018 -0300 Merge pull request #1663 from Automattic/amp-story/1567 1567: Add Image Caption Toggle commit a51d3957a7e1bac2633f49fdf6caf608d83ea459 Author: Jacob Schweitzer <allambition@gmail.com> Date: Thu Nov 29 17:39:41 2018 -0200 1567: Move image caption to renamed getAmpStorySettings function commit 5b33f356797a2ab6acb38696e56594502d91e79a Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 29 21:10:34 2018 +0200 block navigation doesn’t move up & down depending on the presence of the Add Layer button commit bad703ef6bf79be6760dd503310522549172019d Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 29 21:08:31 2018 +0200 Hide adder inside story page when block navigation is visible commit 7c5f4503540fe4d399594a01d7742c752b859d21 Merge: cd133a59 3258a8be Author: Miina <miina.sikk@gmail.com> Date: Thu Nov 29 12:59:23 2018 -0300 Merge pull request #1671 from Automattic/fix/animation-settings Remove 'type' from animation settings. commit 3258a8be32666c9902522f67962fe2bf3600484d Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 29 12:52:16 2018 -0300 Remove type from animation settings. commit 0d6ef2183bbeefd2ab80c1627da5bf38cbc7edf6 Merge: 53a6363e b7489773 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 29 11:19:37 2018 -0300 Merge remote-tracking branch 'origin/develop' into 1569-compatibility_issues commit cd133a598bf0c566307cc6a28b77f8ae622a1651 Merge: 0292335c b7489773 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 29 11:01:17 2018 -0300 Merge remote-tracking branch 'origin/develop' into amp-stories commit 3ad171de7c3d6a1f6ae633e8aef3d4f1b477ca2e Author: Jacob Schweitzer <allambition@gmail.com> Date: Wed Nov 28 19:36:23 2018 -0200 1567: Move image caption setting to AMP story settings section commit 9cb077d5f2deccf537a95123a3030f7c6cb54835 Author: Jacob Schweitzer <allambition@gmail.com> Date: Wed Nov 28 14:49:06 2018 -0200 1567: Do not show toggle setting for fill image commit 50f2b10f66eebe74c90b00cfdafcd4a967b0302b Author: Jacob Schweitzer <allambition@gmail.com> Date: Wed Nov 28 14:13:30 2018 -0200 1567: Remove trailing comma commit e0518f102ae44393be4dfb57d30f8b548273ec0e Author: Jacob Schweitzer <allambition@gmail.com> Date: Wed Nov 28 14:07:52 2018 -0200 1567: Remove value since we don’t use it commit 762f534d88583e608aaeb6d77c37d876619dca06 Author: Jacob Schweitzer <allambition@gmail.com> Date: Wed Nov 28 13:56:47 2018 -0200 1567: Merge caption toggle with story editor blocks and add updates from code review commit 53a6363eef13a23887f92886f7bdb043b4e10d87 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Nov 28 10:39:28 2018 -0300 Remove todo note. commit a15f5c1dac51fa38087494ebe61446a76e0f8a3a Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Nov 28 10:37:06 2018 -0300 Do not add postre portrait if it was not found, to cause AMP Validation error. commit a3fc4843db067f924a3ad4fef32f148d84bef766 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Nov 28 10:34:06 2018 -0300 Update logic to match the new generated tags structure. commit f5131905907868124975e2e477f45953d15498cd Author: Jacob Schweitzer <allambition@gmail.com> Date: Tue Nov 27 20:38:52 2018 -0200 1567: Remove comma to fix ESLint issue commit 9e0fc0387d0197abbd1c17a161a28c305782fd92 Merge: 36c806e6 0292335c Author: Jacob Schweitzer <allambition@gmail.com> Date: Tue Nov 27 20:32:18 2018 -0200 Merge remote-tracking branch 'origin/amp-stories' into amp-story/1567 commit 36c806e6e929fbbbe1e11167fac6289a17a28182 Author: Jacob Schweitzer <allambition@gmail.com> Date: Tue Nov 27 20:31:42 2018 -0200 1567: Add Image Caption Toggle script and CSS commit 859d0b8b3a851c5287bf4816d68c73c0c707e9d2 Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 27 17:53:54 2018 -0300 Update python script. commit 48f08b213a1ea9f8ef1d2a4a688256962d11c225 Merge: 7710a4e1 0292335c Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 27 12:02:01 2018 -0300 Merge remote-tracking branch 'origin/amp-stories' into 1569-compatibility_issues commit 0292335c301cfe74769e8ebfffa2dc02a93a6cb3 Merge: 8e8dfe56 ccb1edf2 Author: Miina <miina.sikk@gmail.com> Date: Mon Nov 26 19:08:09 2018 -0300 Merge pull request #1655 from Automattic/amp-story/1532-add-cta [amp-stories sub-task] Hide CTA on the first page in block explorer commit ccb1edf22d760c61417081fec96e7b4bee4bb6b4 Author: Mike Crantea <mike.crantea@xwp.co> Date: Mon Nov 26 23:50:00 2018 +0200 1532 - Hide the CTA element button when adding on first page commit 7710a4e1376b12bcc9de07a8f05a8cfc9799f263 Merge: 94352055 8e8dfe56 Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Nov 26 18:04:21 2018 -0300 Merge amp-stories & resolve conflicts. commit 8e8dfe56509b8e07560b10515a5efac9021e4ec8 Merge: 9ceef5fa 9a0daf6d Author: Mike Crantea <mehigh@users.noreply.github.com> Date: Mon Nov 26 22:25:09 2018 +0200 Merge pull request #1642 from Automattic/amp-story/1564-layer_manipulation [WIP] [amp-stories sub-task] Improve Layer Manipulation commit 9a0daf6d9fcb53f59c8225afcad27c6120fa5cae Author: Mike Crantea <mike.crantea@xwp.co> Date: Mon Nov 26 22:24:28 2018 +0200 1563 - Fix the positioning of the add overlay to not overlap sidebar commit bc9c96b979adb59126465bef03b03d74d1eafeb3 Author: Mike Crantea <mike.crantea@xwp.co> Date: Mon Nov 26 22:13:52 2018 +0200 1563 - Yeah commit 9593a59c045d3fe027df1c0dbf4c6fd831fe8eac Author: Mike Crantea <mike.crantea@xwp.co> Date: Mon Nov 26 22:13:47 2018 +0200 1563 - Update selectors to match reworked model commit 69a9c637f8f4eb18ff0cc24f6b0e665578541c30 Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Nov 26 13:34:30 2018 -0300 Rework Block Navigation commit 6139b6345218761342943ce104389b9a298b4dc2 Merge: c18aecb8 9ceef5fa Author: Mike Crantea <mike.crantea@xwp.co> Date: Sun Nov 25 20:04:55 2018 +0200 Merge branch 'amp-stories' into amp-story/1564-layer_manipulation commit c18aecb86b2dc9b9b9034bb1a34de6a58260c0db Author: Mike Crantea <mike.crantea@xwp.co> Date: Sun Nov 25 19:59:04 2018 +0200 1563 - Add Layer text next to block navigation commit 47db39de8de683ac2cd8816d0071e916e56a347f Author: Mike Crantea <mike.crantea@xwp.co> Date: Sun Nov 25 19:48:05 2018 +0200 1563 - Comment commit f8efb5da2b66b9e9ca5c81afa71a21ba5fcc3d4b Author: Mike Crantea <mike.crantea@xwp.co> Date: Sun Nov 25 19:30:13 2018 +0200 1563 - Avoid Block Navigation from overlapping content commit b9225d2389241b3b7bdb7006eb501266912a62e4 Author: Mike Crantea <mike.crantea@xwp.co> Date: Sun Nov 25 17:58:50 2018 +0200 Revert "1563 - Allow the cta layer to grow vertically" This reverts commit 418ad0c38fdc86dcf20ad5c38fcff8b0e7983267. commit 418ad0c38fdc86dcf20ad5c38fcff8b0e7983267 Author: Mike Crantea <mike.crantea@xwp.co> Date: Fri Nov 23 16:09:11 2018 +0200 1563 - Allow the cta layer to grow vertically commit 9ceef5fa01d45566e0de79d395140e4e1ad61870 Merge: 2349c4fd f8821450 Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 23 11:07:05 2018 -0300 Merge develop & resolve conflicts. commit ddd6c0027896680aa159160f36106d1bead3eae2 Merge: f5625344 756f969b Author: Mike Crantea <mike.crantea@xwp.co> Date: Fri Nov 23 16:03:33 2018 +0200 Merge branch 'amp-story/1563-improve_selecting_layers' into amp-story/1564-layer_manipulation commit 756f969b427235d59e10180f36501f7b4c8d236b Merge: e7aca954 331239f4 Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 23 11:00:57 2018 -0300 Resolve conflicts. commit f56253446873c5492b0f565e748ccbf9e9c3ac03 Author: Mike Crantea <mike.crantea@xwp.co> Date: Fri Nov 23 16:00:22 2018 +0200 1563 - Hide the always visible block navigator on smaller screens commit e7aca95451b30c8d793da40d94593fefa634896d Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 23 10:58:38 2018 -0300 Remove importing lodash. commit 4e646a2710c1fa855cffe50abdb6c3515273da30 Merge: 7c095c25 f8821450 2349c4fd Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 23 10:39:51 2018 -0300 Merge amp-stories. commit 48d11d1380429cdb09027c81ff3811b8734b1e8c Author: Mike Crantea <mike.crantea@xwp.co> Date: Fri Nov 23 15:17:42 2018 +0200 1564 - Make the label stay visible while the layer is selected commit 627837c6ae9cb236c207ccce2ed8f5ea98eee1e6 Author: Mike Crantea <mike.crantea@xwp.co> Date: Fri Nov 23 13:46:20 2018 +0200 AMP Story - CSS comments + Table of Contents commit e65d5015186fa90b951ee93ccaf022e9c0fddbf3 Merge: 4bb91d4e 331239f4 Author: Mike Crantea <mike.crantea@xwp.co> Date: Fri Nov 23 12:23:26 2018 +0200 Merge branch 'amp-story/1563-improve_selecting_layers' into amp-story/1564-layer_manipulation commit 331239f491e37bd5153a34d6e85564f1ade5b8be Merge: 3d8c9153 2349c4fd Author: Mike Crantea <mike.crantea@xwp.co> Date: Fri Nov 23 12:23:11 2018 +0200 Merge branch 'amp-stories' into amp-story/1563-improve_selecting_layers commit 2349c4fd026d2bed04d44a3187f298b1d7bbb468 Merge: 68161de4 81a7459b Author: Miina <miina.sikk@gmail.com> Date: Thu Nov 22 20:14:39 2018 -0300 Merge pull request #1636 from Automattic/amp-story/1562 [amp-stories sub-task] CTA UI improvements commit 81a7459b44d27ef2f50fa5b47ce621c2ca5c5229 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 22 19:29:00 2018 -0300 Add outline for CTA layer blocks, too. commit dae0bcb20f26dc7361844de7f3b03eaaea9ecb05 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 22 19:26:01 2018 -0300 Improve CTA style. commit 4bb91d4ee559574cc7430ea5d9eebbbbc3dede3f Merge: 22002eb0 3d8c9153 Author: Mike Crantea <mike.crantea@xwp.co> Date: Fri Nov 23 00:13:57 2018 +0200 Merge branch 'amp-story/1563-improve_selecting_layers' into amp-story/1564-layer_manipulation commit b37d4303fbac83bcd8f9fd941249eb28554af533 Merge: 703c0e58 453441df Author: Jacob Schweitzer <allambition@gmail.com> Date: Thu Nov 22 20:08:09 2018 -0200 Merge branch 'amp-story/1562' of https://github.com/Automattic/amp-wp into amp-story/1562 commit 703c0e588b3bdeeb5ead65b145cb22fc02ed41c1 Author: Jacob Schweitzer <allambition@gmail.com> Date: Thu Nov 22 20:07:54 2018 -0200 1562: Only add data-amp-selected to CTA layer commit 22002eb0f023e92c72959a1ac2f4cf6f880294cc Merge: 25bdbcbf 68161de4 Author: Mike Crantea <mike.crantea@xwp.co> Date: Fri Nov 23 00:07:22 2018 +0200 Merge branch 'amp-stories' into amp-story/1564-layer_manipulation commit 3d8c9153b2575bd1cf7836bfb03651bafc1a9fab Merge: 7c095c25 68161de4 Author: Mike Crantea <mike.crantea@xwp.co> Date: Fri Nov 23 00:06:32 2018 +0200 Merge branch 'amp-stories' into amp-story/1563-improve_selecting_layers # Conflicts: # assets/css/amp-editor-story-blocks.css commit 453441df74e7911d96902af91ad575b800a59b59 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 22 18:56:24 2018 -0300 Add missing text domain. commit 68161de4debd122d94215258f841918fa324e343 Merge: ead88008 4e2f1144 Author: Mike Crantea <mehigh@users.noreply.github.com> Date: Thu Nov 22 23:53:15 2018 +0200 Merge pull request #1648 from Automattic/amp-story/1532-page-add 1532 - Added support for the older G block-list-apender for ghost page commit 4e2f1144abdbd6dac3a79f9425446db08603eb68 Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 22 23:51:57 2018 +0200 1532 - Added support for the older G block-list-apender for ghost page commit 16bf325a4008244211377a89dc344dad4c4b4137 Merge: 96aa5c6d ead88008 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 22 18:47:31 2018 -0300 Merge remote-tracking branch 'origin/amp-stories' into amp-story/1562 commit 96aa5c6db3f8ed21ce6717baadd65df9de75cf2c Author: Jacob Schweitzer <allambition@gmail.com> Date: Thu Nov 22 19:41:31 2018 -0200 1562: Update props instead of using block selector for AMP story cta layer focus commit ead88008e09992fedcc703bcb05ba529737b158c Merge: 5765b9a5 3722fb28 Author: Mike Crantea <mehigh@users.noreply.github.com> Date: Thu Nov 22 23:34:46 2018 +0200 Merge pull request #1644 from Automattic/amp-story/1559-improve_adding_blocks [amp-stories sub-task] Hide disallowed blocks from Inserter commit 5765b9a592f8a7be48c45343e95d657a4dbf2c76 Merge: 0e40c83f 540e9214 Author: Mike Crantea <mehigh@users.noreply.github.com> Date: Thu Nov 22 23:13:51 2018 +0200 Merge pull request #1629 from Automattic/1524-improve-outline [amp-stories sub-task] Improve outline of blocks. commit 540e9214dd4e45191615620052e5078b3b4075b3 Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 22 23:12:02 2018 +0200 1522 - Update the border & background of the page commit 521109706d3602e6eb99c11ae4b2a29863ea63e4 Author: Jacob Schweitzer <allambition@gmail.com> Date: Thu Nov 22 19:11:45 2018 -0200 Use data-amp-selected attribute to identify parent CTA layer commit c9805e7ceaa653b48de2af64573a4dc2d10d8dd1 Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 22 23:06:48 2018 +0200 1524 - Removing important width on block list layout. (was causing CTA to get out of its space) commit 3f84e6183eb60815c4ca6398a175ab9d425430f8 Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 22 22:55:37 2018 +0200 1524 - Made CTA layer not overflow when too much text is entered commit c690bd8f151d9847f067bb79c7962057ec1ac489 Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 22 22:54:57 2018 +0200 1524 - Removed some old outlines. commit 9a19ab9471a15eaf7e53a35aa476b12c22c1ac24 Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 22 21:45:15 2018 +0200 1524 - Added border around the stories to match the ghost page commit b1ec0e7344cf7a96ba8ad27640f5e31ed4d1365a Merge: ce318922 0e40c83f Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 22 21:28:00 2018 +0200 Merge branch 'amp-stories' into 1524-improve-outline # Conflicts: # assets/css/amp-editor-story-blocks.css commit 0e40c83f99e7ce9712561ae38428f5fb990a34fa Merge: c0ac4f3a 33384da2 Author: Mike Crantea <mehigh@users.noreply.github.com> Date: Thu Nov 22 21:07:08 2018 +0200 Merge pull request #1632 from Automattic/1532-improve-page-block-flow [amp-stories sub-task] Improve adding a page block flow commit 33384da2940a2716d298720f8002cdfd2423a6f7 Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 22 20:57:21 2018 +0200 1532 - Missed turning the text into shapes in the vector. commit 399adada32561328e1a02f5aef1f105c52c42b21 Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 22 20:36:44 2018 +0200 1532 - Add shadow hover animation on the ghosted page commit befd00ebf9d6fde4f0b503eefbda66eea3ee286e Author: Jacob Schweitzer <allambition@gmail.com> Date: Thu Nov 22 16:35:16 2018 -0200 1562: Use else if to prevent error when trying to remove block twice commit 5718f0b1709cf387811ae1408c23e6f6fe4be01d Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 22 19:57:43 2018 +0200 1532 - Updated page icon in side navigator commit 6815d2af1e44ab6228647b9a21a127646aa63e4b Author: Jacob Schweitzer <allambition@gmail.com> Date: Thu Nov 22 15:46:34 2018 -0200 1562: Use core/button as template commit eac43347844d4fcf2c98cc06f7bf1d8812fade50 Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 22 19:40:03 2018 +0200 1532 - Apply the ghosted page only to the last added on the page + hide the newest Gutenberg search commit 3722fb28be42c1aac9a14576e721aff17c6da699 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 22 13:54:35 2018 -0300 Fix not needed blocks being displayed in Inserter. commit 065284ca50e1a95994889665c533c54f1c1de0c6 Merge: fdd938e6 c0ac4f3a Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 22 18:48:16 2018 +0200 Merge branch 'amp-stories' into 1532-improve-page-block-flow commit fdd938e62c0d464428c8419b74b72a483f62f547 Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 22 18:46:51 2018 +0200 1532 - Optimize page inserter SVG commit 17885386829320d0addfc3722503abef62221ce0 Author: Mike Crantea <mike.crantea@xwp.co> Date: Thu Nov 22 18:46:23 2018 +0200 1532 - Optimised SVG commit 25bdbcbf22342d166a26ba793498e463349b3329 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 22 12:56:29 2018 -0300 Add missing key. commit ac6d42a73f613d7942e04a2c9e291b849ffa616d Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 22 11:25:45 2018 -0300 Add breadcrumb to selected layer blocks. commit 86c8209d18a32f36c019ad6746cbaa68c5af0390 Author: Jacob Schweitzer <allambition@gmail.com> Date: Wed Nov 21 21:05:19 2018 -0200 Remove template as it gives error on new CTA creation commit 3e1aac72b215f3b49ca274306e5e4fde6a38e043 Author: Jacob Schweitzer <allambition@gmail.com> Date: Wed Nov 21 20:24:50 2018 -0200 Add RichText template with placeholder commit 3e90bd124fe3358da88ae6cf0710ba1939bd5103 Author: Jacob Schweitzer <allambition@gmail.com> Date: Wed Nov 21 20:24:34 2018 -0200 Do not try to add class if no element exists commit 26776a7f481fa545aae41e33fdcdc8e8628333bd Author: Jacob Schweitzer <allambition@gmail.com> Date: Wed Nov 21 20:11:24 2018 -0200 Fix blurred element issue when selecting AMP CTA child commit f966c72ae65b9388e22cb81b612a320049faa516 Merge: 4fa99236 c0ac4f3a Author: Jacob Schweitzer <allambition@gmail.com> Date: Wed Nov 21 19:24:55 2018 -0200 Merge branch 'amp-stories' into amp-story/1562 commit c0ac4f3a06839625e5a4568f7555692a66a37218 Merge: ec5d2c8f a2bab228 Author: Miina <miina.sikk@gmail.com> Date: Wed Nov 21 16:39:53 2018 -0300 Merge pull request #1635 from Automattic/amp-story/enqeueue-wp-editor Enqueue WP Editor in AMP Stories. commit a2bab228f3138c49415cdee617ce236dde0f8610 Merge: 4d7fabb0 ec5d2c8f Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Nov 21 16:18:04 2018 -0300 Merge amp-stories. commit 4d7fabb0199db980c3e3f705e9b9dd62d8b3ccb0 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Nov 21 16:15:30 2018 -0300 Include wp-editor and fix custom blocks in Gutenberg 4.5.1 commit 4fa992368a3dd2dfe079d496cfd90b1a27998130 Author: Jacob Schweitzer <allambition@gmail.com> Date: Wed Nov 21 16:11:39 2018 -0200 1562: Block insertion of cta layer in first amp story page commit ce318922d1c564063b8852a6708d4785e8155f56 Author: Mike Crantea <mike.crantea@xwp.co> Date: Wed Nov 21 15:38:45 2018 +0200 1524 - Fix issue with warning block not being clickable commit 0d2f64352baab5eb00dbe19455b999d102b22d39 Merge: 58ad5199 ec5d2c8f Author: Mike Crantea <mike.crantea@xwp.co> Date: Wed Nov 21 15:35:58 2018 +0200 Merge branch 'amp-stories' into 1524-improve-outline commit ec5d2c8f78e3de748197ad947ccf1aa458be0a4f Merge: 63b4a0ba 71cbcad7 Author: Mike Crantea <mehigh@users.noreply.github.com> Date: Wed Nov 21 15:20:30 2018 +0200 Merge pull request #1625 from Automattic/1565-paragraph-font-adjustments [amp-stories sub-task] Adjust default paragraph settings. commit 58ad5199ea2986b454e101be8f1ed2482ba80de8 Author: Mike Crantea <mike.crantea@xwp.co> Date: Wed Nov 21 14:40:09 2018 +0200 1524 - Add white shadow to placeholder text commit 7f293bf64f603569cc867eedb281eff72269fc14 Author: Mike Crantea <mike.crantea@xwp.co> Date: Wed Nov 21 14:32:33 2018 +0200 1524 - Maintain blue border when selecting the story page commit df52684900ed5e43a35e3a61d173bcc50f2bb331 Author: Mike Crantea <mike.crantea@xwp.co> Date: Wed Nov 21 14:15:28 2018 +0200 1524 - Maintain blue outline of the currently selected layer (vertical / fill image) commit 2caa417fe7f669f98530420ef18f83e590337511 Merge: b3c437b2 63b4a0ba Author: Mike Crantea <mike.crantea@xwp.co> Date: Wed Nov 21 14:05:59 2018 +0200 Merge branch 'amp-stories' into 1524-improve-outline commit b58548467d1f112f06489a636b23a0d383035036 Author: Shannon MacMillan <shannon@bluestormcreative.com> Date: Tue Nov 20 23:10:29 2018 -0700 Remove top margin from inserter commit 25aeacb41b24b0374281198907b2a76da6ea3c32 Author: Shannon MacMillan <shannon@bluestormcreative.com> Date: Tue Nov 20 23:08:21 2018 -0700 Add post type class to keep inserter styles siloed commit 5c9d8f18a10fea0117dd06fd3e0eb17b05d68679 Author: Shannon MacMillan <shannon@bluestormcreative.com> Date: Tue Nov 20 23:07:31 2018 -0700 Add new svg page icon commit fbee984a664103030c6e7464dfd5de8e76f528eb Author: Shannon MacMillan <shannon@bluestormcreative.com> Date: Tue Nov 20 23:07:20 2018 -0700 Styles for inserter to become ghosted page commit 7c095c25b9e1318ec2be4135cd15d6699904d931 Merge: 34d75108 63b4a0ba Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 20 16:20:35 2018 -0300 Merge amp-stories and resolve conflicts. commit 34d75108b24b4d4e47d725f5e3f8dd1dc8395d75 Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 20 16:14:24 2018 -0300 Replace custom layer inerter with default Inserter. commit 57fa07712be12ab5ff526b0acaa8b923305b68a8 Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 20 16:11:41 2018 -0300 Create custom block navigator to display nex to each page. commit 63b4a0ba90c62df0f027b082d1945a37293804cd Merge: ddd02d33 0debd1a1 Author: Mike Crantea <mehigh@users.noreply.github.com> Date: Tue Nov 20 20:09:43 2018 +0200 Merge pull request #1600 from Automattic/1531-prepopulate_page [amp-stories sub-task] Prepopulate Page block. commit 0debd1a1bab484237f052ef4000db240643e88eb Merge: ff909fae ddd02d33 Author: Mike Crantea <mike.crantea@xwp.co> Date: Tue Nov 20 20:00:40 2018 +0200 Merge branch 'amp-stories' into 1531-prepopulate_page # Conflicts: # assets/css/amp-editor-story-blocks.css commit ff909fae5ce533abf59800ce94fe2aed1f0c0bc6 Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 20 14:10:29 2018 -0300 Fix spacing. commit 086a9b3a2c7d4f25d5fe56868f1873994d954d86 Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 20 14:07:38 2018 -0300 Use data-amp-selected=parent istead of overwriting default classes. commit 3b8c596c22b13279f24164d7d1cea1d0bfa88457 Merge: 97428ecf 77949e3d Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 20 13:46:19 2018 -0300 Merge branch '1531-prepopulate_page' of github.com:Automattic/amp-wp into 1531-prepopulate_page commit 97428ecf255048da1839797227d3043df60f2331 Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 20 13:45:27 2018 -0300 Add back is-selected-parent class. commit b3c437b29939d286a28345e465d2a28d1d6f2e71 Author: Mike Crantea <mike.crantea@xwp.co> Date: Tue Nov 20 18:25:06 2018 +0200 1524 - Added blue border around rich text entries + white shadow commit 77949e3dc8d7d6beb944170e097aff3580f73fa0 Author: Mike Crantea <mike.crantea@xwp.co> Date: Tue Nov 20 17:27:37 2018 +0200 1531 - Add 30% opacity + blur when selecting a layer with other layers beneath it commit aa3fcf030daa085a3153c474b0b9893475ef7b4d Author: Mike Crantea <mike.crantea@xwp.co> Date: Tue Nov 20 17:23:10 2018 +0200 1531 - Avoid images from shrinking on small height screens commit c46aa64f11c22ed210d1e2e3b6cd4f2cd87b3e1d Author: Mike Crantea <mike.crantea@xwp.co> Date: Tue Nov 20 17:18:45 2018 +0200 1531 - spaced out the blocks even more commit 10977604d94bc5527d070360a4fbb99b1e93bb70 Author: Mike Crantea <mike.crantea@xwp.co> Date: Tue Nov 20 17:11:33 2018 +0200 1531 - Avoid overlap of blocks outlines inside of vertical commit a5fd75f49aec05061d6f607499c2a08a949f44f1 Author: Mike Crantea <mike.crantea@xwp.co> Date: Tue Nov 20 17:05:53 2018 +0200 1531 - Removed unused variable commit 60e654385aef86e26bb571d29af34fbb21620263 Author: Mike Crantea <mike.crantea@xwp.co> Date: Tue Nov 20 17:01:34 2018 +0200 1531 - Avoid zooming out the story on small height screens commit f60ded5b3468f0270cf08bfa30789ea72e7c1ccf Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 20 11:48:11 2018 -0300 Add custom block navigator. commit 71cbcad7a1107cad1c9784480a0d7b1784dc686a Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 20 09:57:20 2018 -0300 Adjust parsing ints. commit 7ec096923c19445694e23e2831062e8563995e9d Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 20 09:48:51 2018 -0300 Remove Layer cards. commit 927bb5727752875592a678a49045d3c6df407ca9 Author: Mike Crantea <mike.crantea@xwp.co> Date: Mon Nov 19 22:35:29 2018 +0200 1531 - Add animated opacity & blur change on selecting one of the layers commit c42a1b2a601487dd2b29e19a2c4725b361fe12c3 Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 16 20:22:01 2018 -0300 Merge fixes for attributes. Add special handling for paragraph. commit 6fe2a3fc51f164e7e026d43ca2235a0dea0f2968 Merge: b8bc64af 1d7044b2 Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 16 20:00:07 2018 -0300 Merge branch 'fix/block-attributes' into 1565-paragraph-font-adjustments commit 1d7044b292c29decfb08d46875a34557e4fe9b00 Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 16 19:43:01 2018 -0300 Remove 'type' from attributes where source is set. commit b8bc64af73da5a9581871888f615d5457e5c8c32 Merge: be0320a3 ddd02d33 Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 16 18:43:59 2018 -0300 Merge remote-tracking branch 'origin/amp-stories' into 1565-paragraph-font-adjustments commit ddd02d332a71b21c78d577b0ba2e9d2d8b6caba5 Merge: 14565127 2938438a Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 16 18:31:43 2018 -0300 Merge remote-tracking branch 'origin/develop' into amp-stories commit be0320a37628c47c209731f31d242a9905c16684 Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 16 18:24:09 2018 -0300 Test commit. commit c5c959449e9236fb076863d035e8ba2daf9151eb Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Nov 14 19:39:37 2018 -0300 Add is-selected-parent class. commit f224c631d862565a2a644d83b09a500b2a0551fc Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Nov 14 19:29:53 2018 -0300 First try with reverting the amp-fit-text. commit 94352055611c5a442ec7af4a5f04672d00bf7811 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Nov 14 11:33:22 2018 -0300 Use remove_invalid_child instead of just removing the node. commit 89943fc102228dce322070bf33021d5849d6613e Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 13 16:15:07 2018 -0300 Add child_tags tags spec. commit 0502874340c4d68c0bbbacb018db9aac2a8c7abc Author: Mike Crantea <mike.crantea@xwp.co> Date: Tue Nov 13 19:37:07 2018 +0200 1531 - Limit max-height of the fill video to the size of the layer. there’s no need for the video controls (which are hidden in the actual story) to be visible in the admin. Before: http://cloud.urldocs.com/22a43db6def0 After: http://cloud.urldocs.com/0a16dc922ec6 commit fa78eb94b153465f9770f36a3f0af6fcf104bde7 Author: Mike Crantea <mike.crantea@xwp.co> Date: Tue Nov 13 19:18:58 2018 +0200 1531 - Make image fill cover the layer entirely commit 369d1abe16e9a69b6c54a8f6f32a7012defe3bba Author: Mike Crantea <mike.crantea@xwp.co> Date: Tue Nov 13 19:18:28 2018 +0200 1531 - Avoid zooming the layers in on large screens commit 8ac21e15f3865f454b5c03307398d042b176d7d2 Author: Mike Crantea <mike.crantea@xwp.co> Date: Tue Nov 13 19:00:35 2018 +0200 1531 - Keep this full height when the contextual toolbar is present commit 0758d00dbc98b8ca7ca99685e5a7047f4ae26c55 Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 13 13:55:27 2018 -0300 Add check for existing child nodes. commit 786a0f3309b62b58afadbdd04d3b3af3bf8cae87 Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 13 13:46:57 2018 -0300 Implement allowed_descendant_tags Hide Link button from Grid Layer paragraph blocks. commit 8801bbd8e9314bb65b02a2eeda3963361ba937ea Author: Mike Crantea <mike.crantea@xwp.co> Date: Tue Nov 13 17:53:48 2018 +0200 1531 - Make ‘fill-image’ gray edit area full height commit 017b9cc20a009e0efac3b3a42766f5afaec5a070 Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Nov 12 19:25:28 2018 -0300 Add check for featured image in case of AMP Stories. commit c1e5f807eb3bfd54e0d6725063841e6f78a453a5 Merge: 14565127 6f056685 Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Nov 12 16:55:02 2018 -0300 Merge remote-tracking branch 'origin/fix/displaying-validation-warning' into 1569-compatibility_issues commit 6f056685c4411a35d3994026afcebfcf2a1d1cd3 Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Nov 12 15:56:14 2018 -0300 Remove unused code. commit 90f662ab60b23c5a7913a062fee4fa23613dac21 Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Nov 12 15:42:19 2018 -0300 Update creating warning notice. commit 145651278bfc062eebfc061b86b896897337d29a Merge: 482676eb b5e0be4e Author: Miina <miina.sikk@gmail.com> Date: Fri Nov 9 15:34:23 2018 -0300 Merge pull request #1594 from Automattic/1530-split_grid_layer_block [amp-stories sub-task] Split Grid Layer Block commit b5e0be4e624085eea70810a8aa47c2f94fb4c8f0 Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Nov 9 15:27:11 2018 -0300 Add correct SVG files. commit 05d1fd21ff2d23e01587750ac896f2c394e16ed8 Merge: 69c47ea3 e9dcf0d5 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 8 17:38:19 2018 -0300 Merge remote-tracking branch 'origin/1530-split_grid_layer_block' into 1531-prepopulate_page commit e9dcf0d58c8d8106befd5f40a892c88aa48baac5 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 8 17:37:54 2018 -0300 Fix eslint. commit 69c47ea31ee67a09ed507a50fa4d8fb969d11e77 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 8 17:29:55 2018 -0300 Prepopulate new page with background image and vertical layer. commit 3a458c37e631d6fdb2a3e9e8619a6ef51f0e437b Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 8 17:11:38 2018 -0300 Add placeholder SVG files for icons. commit a9b25e8e22358b4afa3fdbb3b8f742e75c01ea48 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 8 16:23:08 2018 -0300 Fix jshint. Again. commit 6cd5978cdff660670eb5812874be2a76bdd16577 Merge: 9f4c5d06 482676eb Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 8 16:16:01 2018 -0300 Merge remote-tracking branch 'origin/amp-stories' into 1530-split_grid_layer_block commit 482676eb85b08dfa139875e20eb5d3eade946ecd Merge: 747be0d6 469e9921 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 8 16:15:28 2018 -0300 Merge remote-tracking branch 'origin/develop' into amp-stories commit 9f4c5d069e05916985dc5b11611b655636f1d488 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 8 16:04:37 2018 -0300 Fix eslint. commit 10f334b86c171a307f298fad75d3cee851ae9e1a Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 8 15:44:53 2018 -0300 Refactor templating. Update layer control. commit 01a663d3c5fc620d694f0a436c48fb4de11c4110 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 8 15:11:49 2018 -0300 Refactor code. commit ef637a621edc997c9b3c32e25ee67d195f828e35 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 8 14:34:48 2018 -0300 Add text domains where missing. commit 95e14aa203f7a07c4f4d3cd75c5d8804d4b56676 Merge: fd654b9c 747be0d6 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Nov 8 14:11:18 2018 -0300 Merge amp-stories & resolve conflicts. commit 747be0d609a2b1479cbbaa770c9f4ee99f012fdd Merge: a2856229 39105023 Author: Miina <miina.sikk@gmail.com> Date: Thu Nov 8 14:09:27 2018 -0300 Merge pull request #1595 from Automattic/amp-stories-remove-prefix [amp-stories subtask] Remove prefix from block titles commit 39105023e7d328b93d38d29d9d765f19488c5e73 Author: Jacob Schweitzer <allambition@gmail.com> Date: Thu Nov 8 13:54:18 2018 -0200 Add text domain to AMP stories block titles commit 36e1f99b2604d7f8ed3c0827e6151b253a350445 Author: Jacob Schweitzer <allambition@gmail.com> Date: Thu Nov 8 10:16:17 2018 -0200 Remove AMP Story prefix from block names commit fd654b9ca44067b48294f9efddd6a1465d68e0e4 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Nov 7 19:07:15 2018 -0300 Fix layer inserter. commit a285622962a313f6f2c270965b99fb76151d0e75 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Nov 7 15:33:26 2018 -0300 Fix margin for fill template. commit 0a1b84ca43bc00e3c700a76ab59f49cd18689da0 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Nov 7 15:23:12 2018 -0300 Add background fill layers. commit ca0f4baeb98ff878c2783bf811f858560e885920 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Nov 7 15:22:56 2018 -0300 Add background fill layers. commit 7de1d76a7de789d5b12bc2b43741e84aadc00097 Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Nov 6 14:04:11 2018 -0300 Split Grid Layer block into 4 blocks based on template. commit d7788bfbee676e3d36a646c0860999c3d96576d2 Merge: a3c6c598 6862373f Author: Mike Crantea <mike.crantea@xwp.co> Date: Fri Nov 2 10:20:03 2018 +0200 Merge branch 'develop' into amp-stories commit a3c6c5982bacf2a8c879c8c251be4a57a7b2a0c7 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Oct 11 16:19:53 2018 -0300 Change back uuid version. commit 6bde3e20be9f768bce6db76abc8c98d9042d5f05 Merge: 9dd04c9e a3983a07 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Oct 11 14:55:03 2018 -0300 Merge develop commit 9dd04c9ea927b73aa5e31e8a82cb86cd9bf96646 Merge: a865553f 76903101 Author: Miina <miina.sikk@gmail.com> Date: Thu Oct 11 14:49:59 2018 -0300 Merge pull request #1504 from Automattic/fix/fix-uuid-package Try to fix UUID package issue. commit 769031019238082338fa8477587bf27284c050d8 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Oct 11 14:43:14 2018 -0300 Modify importing 'uuid'. commit a865553f4d89bab7ad505ff60754a6fded9b2169 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Oct 10 15:17:51 2018 -0300 Improve image background styling. commit 6415f6bdf808f44d39f565bb8f10f146654e7fb5 Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Sep 18 14:09:20 2018 -0300 Style fix. commit 9a8158e4aa6498c2fae9eb4c0950841565883392 Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Sep 17 09:58:43 2018 -0300 Change Opacity label to Layer Opacity. commit 4b0606f072be0513f6d97c7cba6e5b943d91d848 Merge: 434282d1 8ce58ce1 Author: Weston Ruter <weston@xwp.co> Date: Fri Sep 14 14:37:47 2018 -0700 Merge pull request #1434 from Automattic/amp-story/grid-layer-background [amp-stories sub-task] Add opacity and background color to layers. commit 8ce58ce15d8cb3bbde34e03441a7aadba6f3266c Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Sep 14 16:01:03 2018 -0300 Fix eslint issues. commit cfd8e8dccd8283c498eb465c5c022c193a066813 Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Sep 14 15:48:14 2018 -0300 Add opacity and background color controls for grid layer block. commit 434282d1059120b6ab604300b6d324c5fe589d58 Author: Weston Ruter <weston@xwp.co> Date: Wed Sep 12 12:09:44 2018 -0700 Use dotted outline instead of dotted border for selected blocks commit 5884d6c1ff236daca79893c1d9fdf43015c502ba Merge: 2decbde8 25685d4f Author: Weston Ruter <weston@xwp.co> Date: Wed Sep 12 11:38:56 2018 -0700 Merge pull request #1425 from Automattic/amp-story/fixes-vol1 [amp-stories sub-task] UI Fixes commit 25685d4ff3b04d8cb94278e0492b5fdc657e7178 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Sep 12 14:20:06 2018 -0300 Add limits to resizing images. commit b2df5c56283bc0560af594414dcb737468e9307f Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Sep 12 14:06:33 2018 -0300 Hide resizer for amp-story images. commit ed6393c843f58600db401992f93706bffbfdde45 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Sep 12 13:25:16 2018 -0300 Increase z-index of a selected block. commit 87c731a5f9e8e0e41938219a48bc66ab61cc4ee5 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Sep 12 12:17:13 2018 -0300 Style fixes. commit e69e44eab5d73ea7a6d1d79b28f2fb65cc1b6792 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Sep 12 11:17:30 2018 -0300 Disable amp-story post type when Gutenberg is not active. Remove Classic editor action from AMP Story post type. commit 2decbde879ae6a1c2fa099eb48eb06f7ee948af7 Merge: 6304f375 75feec6b Author: Miina <miina.sikk@gmail.com> Date: Tue Sep 11 00:33:46 2018 +0300 Merge pull request #1417 from Automattic/amp-story/layout-selection-fix [amp-stories sub-task] Fix layer selection. commit 75feec6bb3729e0f7c8b997191d6d694c4f4934a Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Sep 10 10:49:31 2018 -0300 Fix layer selection. commit 6304f37587db33578101431a8f8035cfa988ebc1 Merge: 1ef3f8e2 73d6b80a Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Sep 10 10:16:47 2018 -0300 Merge branch 'amp-stories' of github.com:Automattic/amp-wp into amp-stories commit 1ef3f8e2d292313613abc2c102023904b6ae50a9 Merge: 4234619a b3e1b4d0 Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Sep 10 10:16:21 2018 -0300 Merge remote-tracking branch 'origin/develop' into amp-stories commit 73d6b80ad6fa057a9b440426ac9fa602455a4690 Merge: 4234619a d0568285 Author: Weston Ruter <weston@xwp.co> Date: Tue Sep 4 08:13:36 2018 -0700 Merge pull request #1395 from Automattic/amp-story/animation-fix [amp-stories sub-task] Add placeholder for animation duration commit d0568285ab161879f5442425a4bb8b6ea22f3238 Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Sep 4 13:33:28 2018 +0300 Add placeholder for animation duration according to the type. commit 4234619a497305f262ccb0c435be43582b17380b Merge: f70669be 924c22be Author: Weston Ruter <weston@xwp.co> Date: Mon Sep 3 10:03:56 2018 -0700 Merge pull request #1391 from Automattic/amp-story/layout-icons [amp-stories sub-task] Add icons to layer selector. commit 924c22be8214c7d73f423126fed3f79015b58eb1 Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Sep 3 14:25:28 2018 +0300 Fix jscs. commit ce78023b9b2ce03a8ca0d02e1025d065bee356b1 Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Sep 3 14:18:41 2018 +0300 Add icons to layer selection. commit f70669be7200849ac867985d8a5d8fb3179d8c7d Merge: e04df381 9d3a1038 Author: Weston Ruter <weston@xwp.co> Date: Sat Sep 1 20:59:52 2018 -0700 Merge pull request #1388 from Automattic/amp-story/style_fixes [amp-stories sub-task] UI fixes. commit 9d3a10382b90ada55166fdba2b4e51e84cdca949 Merge: 15718e2c e04df381 Author: Weston Ruter <weston@xwp.co> Date: Sat Sep 1 20:50:58 2018 -0700 Merge branch 'amp-stories' of https://github.com/Automattic/amp-wp into amp-story/style_fixes commit e04df38136c64a4164239102d8be3cb5e0654197 Merge: 6eca68bf def0ce01 Author: Weston Ruter <weston@xwp.co> Date: Sat Sep 1 20:50:27 2018 -0700 Merge pull request #1385 from Automattic/amp-story/layout-block [amp-stories sub-task] Add front-end animation. commit def0ce01904814e3bf531afedb8a10effb2dfdf5 Merge: 224ef00f c2a297c3 Author: Weston Ruter <weston@xwp.co> Date: Sat Sep 1 20:44:38 2018 -0700 Merge branch 'develop' of https://github.com/Automattic/amp-wp into amp-story/layout-block commit 224ef00f8702a32ad1670d0944ace8beb68dd36a Author: Weston Ruter <weston@xwp.co> Date: Sat Sep 1 20:43:14 2018 -0700 Revert "Whitelist animation attributes." This reverts commit 6c569c8ad6543dfdc9a9542e91e8a89343ba41eb. commit 15718e2ce51854a6b1af559ddc7aae2aefc1980e Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Aug 31 16:00:07 2018 +0300 UI updates. commit 4923569a2f561f1b5aad8fe6d5bafd72e9c97ae4 Author: Miina Sikk <miina.sikk@gmail.com> Date: Fri Aug 31 14:34:41 2018 +0300 Change animation settings source to attribute. commit 32b7524ee0a2c05ac8f39652a4a401edb699cc84 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Aug 30 21:55:08 2018 +0300 Enable animations for CTA layer, too. commit 6c569c8ad6543dfdc9a9542e91e8a89343ba41eb Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Aug 30 21:37:58 2018 +0300 Add animation to core blocks. Whitelist animation attributes. commit 10826df097b28e538699ce7a042fd58cd5da0c7a Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Aug 30 19:08:47 2018 +0300 Start adding animation for core blocks. commit 8518dae5b2cea29b549639e292b7a1cb1ab2a08e Merge: 5e9a535a 6eca68bf Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Aug 30 18:48:04 2018 +0300 Merge amp-stories and resolve conflicts. commit 6eca68bf387df848ebe6c84c4514e675766c95cf Merge: b6f696a2 dc87187c Author: Weston Ruter <weston@xwp.co> Date: Wed Aug 29 12:25:36 2018 -0700 Merge pull request #1347 from Automattic/amp-story/layouts [amp-stories sub-task] Grid layers layout commit dc87187c3ca770c43e39f370aeb622f3f7c5d14c Author: Weston Ruter <weston@xwp.co> Date: Wed Aug 29 12:16:04 2018 -0700 Ensure amp-runtime and Gutenberg block styles are included on story template commit b7afb232754bb14853739692694d5d76945c9339 Author: Weston Ruter <weston@xwp.co> Date: Wed Aug 29 12:15:40 2018 -0700 Ensure a singular AMP story always is_amp_endpoint commit 5e9a535a0cd9182d44de98546db092ed2f051624 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Aug 29 21:57:52 2018 +0300 Add animation controls for AMP Story layer blocks. commit b486847b526e7deef425e148f490a0708e9e0df2 Merge: 6ff0bf65 b6f696a2 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Aug 29 19:41:57 2018 +0300 Merge amp-stories and resolve conflicts. commit b6f696a20cc383750677b8221cdd93bc4558fc2b Merge: 88a05dfb d6d3f69b Author: Weston Ruter <weston@xwp.co> Date: Wed Aug 29 09:18:08 2018 -0700 Merge pull request #1380 from Automattic/amp-story/page-background [amp-stories sub-task] Add background color to amp-story-page block commit d6d3f69b3f883d62149dcbc12f4082ef5aa40016 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Aug 29 18:05:31 2018 +0300 Adjust texts. commit 0929292c87ddc0c901b031742849d31bbef7fc3d Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Aug 29 18:04:46 2018 +0300 Adjust texts. commit ea4c7765710c07a3e8bbc25e7626ea119393a087 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Aug 29 17:59:28 2018 +0300 Add background color for amp-story-page block. commit 6ff0bf652521e6e6e9a1cbb8802e00e6963f8951 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Aug 29 16:04:50 2018 +0300 Add a partly working workaround for selectBlock issue. commit 912439d6f5db89c6908631e8bbb0cc7071710947 Merge: e5c84d09 88a05dfb Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Aug 29 14:01:17 2018 +0300 Merge branch 'amp-stories' into amp-story/layouts commit 88a05dfb8ed33948335514856028d900541c78d0 Merge: 817b222f c539a181 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Aug 29 14:00:55 2018 +0300 Merge develop & resolve conflicts. commit e5c84d09265a621e7945fea593458f82b00daf6e Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Aug 23 19:32:24 2018 +0300 Extend blocks to allow configuring the position in thirds template. commit b9b410c239f4a5396504d83c40ff7b4bc4b09aba Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Aug 22 21:35:12 2018 +0300 Add CTA Layer to the block inserter dropdown. commit cd4d801a198a3d37db1ffc93a1b3118d72ef2fb8 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Aug 22 20:12:28 2018 +0300 Fix eslint. commit bfdefb9d660a77dc160cd182310804a83007ff5f Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Aug 22 20:06:25 2018 +0300 Fix style for fill template. Remove importing lodash since it breaks media loader. commit 4fa18d3e0c47a561cad6e631c276a0f43a5a70e9 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Aug 22 18:42:42 2018 +0300 Add inserter for grid layers. commit c7951bdc0317ded60136b9f0a6a3a9c411f72626 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Aug 22 14:21:32 2018 +0300 Add grid system to the grid layers. Place layers exactly on top of each other and make more similar to amp-story design in browser. commit 2774a1a0f070856ae981222ab5027a50c84c2f4c Merge: 83d2c34a 6ec83ebb Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Aug 21 22:39:05 2018 +0300 Merge branch 'amp-story/layouts' of github.com:Automattic/amp-wp into amp-story/layouts commit 83d2c34ac962fa4a2dc68906d57bc29ddb831008 Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Aug 21 22:35:50 2018 +0300 Use Button instead of links. Make strings translatable. commit 6ec83ebbfd1d087e81d961a82f538e021891eb6f Merge: 9d79e01f 817b222f Author: Weston Ruter <weston@xwp.co> Date: Tue Aug 21 08:14:39 2018 -0700 Merge branch 'amp-stories' into amp-story/layouts commit 9d79e01fb7135a21e102dcee3b3d8eae382f8c2c Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Aug 21 17:29:48 2018 +0300 Add initial take on BlockSelector for selecting layers. commit 87cca23e040839336f07f63cb56b1a5af1e8d398 Merge: 954c14ef 274971cb Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Aug 20 17:04:37 2018 +0300 Merge remote-tracking branch 'origin/develop' into amp-story/layouts commit 817b222f0ef0c289480d64cbea26b8b2b54b6fe7 Merge: 162b317a 274971cb Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Aug 20 17:04:10 2018 +0300 Merge remote-tracking branch 'origin/develop' into amp-stories commit 954c14ef1b1d68704ff185e69c1697dab4eead02 Merge: de8a1c5b 162b317a Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Aug 20 16:50:35 2018 +0300 Merge remote-tracking branch 'origin/amp-stories' into amp-story/layouts commit 162b317a5db046d9d0591c2093bb6f1cb815ea32 Merge: 6f4f5d79 c259f4c1 Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Aug 20 16:49:59 2018 +0300 Merge branch 'amp-stories' of github.com:Automattic/amp-wp into amp-stories commit de8a1c5bbedf8ed3250840f53ad6d66e5abe246a Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Aug 20 16:47:53 2018 +0300 Modify CSS for having the layer on top of each other and hiding the top layers if a lower one is selected. commit 6f4f5d79f1d04a7d2bdf327987b41f12b2ea5d86 Author: Miina Sikk <miina.sikk@gmail.com> Date: Mon Aug 20 14:51:13 2018 +0300 Generate amp-story-page ID automatically. commit c259f4c1400cc76f19c3e72f54d577f45e109249 Merge: ed2f2d6d 9de6fe36 Author: Weston Ruter <weston@xwp.co> Date: Thu Aug 16 11:23:22 2018 -0700 Merge branch 'develop' of https://github.com/Automattic/amp-wp into amp-stories commit ed2f2d6dde8bde151d9849b2bbd0011ccbee9586 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Aug 16 18:55:00 2018 +0300 Remove duplicate CTA block automatically. Display Admin notice. commit f5b34427b406271c4cb990cf7f21afba97d38fa1 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Aug 16 17:22:21 2018 +0300 Add notice if there are more than one CTA layer and avoid infinite loop when adding extra. commit 761d89b4c53f8cd2ac9bd75ed2eb69e23d8a7c59 Author: Miina Sikk <miina.sikk@gmail.com> Date: Thu Aug 16 15:55:03 2018 +0300 Ensure that the CTA layer is always the last. Fix amp-story-page template and generate it dynamically. commit 4ae6471a607650c2423fe73f71fc338f45317963 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Aug 15 20:10:43 2018 +0300 Add amp-story-cta-layer block. commit 8eb598c565af914915acc5c8993b26233f672633 Author: Miina Sikk <miina.sikk@gmail.com> Date: Wed Aug 15 19:53:24 2018 +0300 Specify allowed blocks for inner contents. commit 81f8f451bb5c42fd890674a17b185c9ac084ea7d Merge: 9a4e7a4c 14d6e4b6 Author: Miina Sikk <miina.sikk@gmail.com> Date: Tue Aug 14 17:24:47 2018 +0300 Merge remote-tracking branch 'origin/develop' into amp-stories commit 9a4e7a4cef8035847384983e2aafa975da2a9f5c Merge: 6e97ede6 d2ad9d61 Author: Weston Ruter <weston@xwp.co> Date: Fri Aug 10 12:26:09 2018 -0700 Merge branch 'develop' into amp-stories commit 6e97ede63a98dfb4b8f2ec5541b33e9e64338b97 Author: Weston Ruter <weston@xwp.co> Date: Mon Jul 9 14:50:33 2018 -0700 Omit AMP Story from get_eligible_post_types since always supported commit cd9cdbe2efba805ae986ad9e0c4645f54ffeb477 Author: Weston Ruter <weston@xwp.co> Date: Mon Jul 9 12:00:48 2018 -0700 Add template amp-story-page to ensure content is not empty commit cbf994c98124336d459bc4013b16d6805328d43a Author: Weston Ruter <weston@xwp.co> Date: Mon Jul 9 11:50:31 2018 -0700 Simplify setting grid-layer children constraints commit 59119d36faadee62fb830ef5d1c54d2dfb1a63ee Author: Weston Ruter <weston@xwp.co> Date: Mon Jul 9 11:31:39 2018 -0700 Revert "Prevent amp-story-page from being used anywhere other than root" This reverts commit 9cd428e38535c0b48b01b25dc6259a92c1eac2ff. commit 9cd428e38535c0b48b01b25dc6259a92c1eac2ff Author: Weston Ruter <weston@xwp.co> Date: Mon Jul 9 11:31:33 2018 -0700 Prevent amp-story-page from being used anywhere other than root commit e74b86a7fb2f6564f0e0704b6f21067f53503ed9 Author: Weston Ruter <weston@xwp.co> Date: Mon Jul 9 10:48:32 2018 -0700 Fix parent restriction for amp-story-grid-layer commit 20bd8ac8680294aa1fe9db137912e7ad2ea11cd5 Author: Weston Ruter <weston@xwp.co> Date: Fri Jun 15 07:14:39 2018 +0200 Try introducing nested blocks for amp-story support

miina added 2 commits August 20, 2018 16:47

Modify CSS for having the layer on top of each other and hiding the t…

de8a1c5

…op layers if a lower one is selected.

Merge remote-tracking branch 'origin/amp-stories' into amp-story/layouts

954c14e

westonruter mentioned this pull request Aug 20, 2018

[WIP] Introduce amp-story support via Gutenberg blocks #1215

Closed

11 tasks

miina added 2 commits August 20, 2018 17:04

Merge remote-tracking branch 'origin/develop' into amp-story/layouts

87cca23

Add initial take on BlockSelector for selecting layers.

9d79e01

miina commented Aug 21, 2018

View reviewed changes

Merge branch 'amp-stories' into amp-story/layouts

6ec83eb

westonruter reviewed Aug 21, 2018

View reviewed changes

miina added 2 commits August 21, 2018 22:35

Use Button instead of links. Make strings translatable.

83d2c34

Merge branch 'amp-story/layouts' of github.com:Automattic/amp-wp into…

2774a1a

… amp-story/layouts

jwold mentioned this pull request Aug 21, 2018

Implement AMP Stories #968

Closed

25 tasks

miina added 5 commits August 22, 2018 14:21

Add grid system to the grid layers. Place layers exactly on top of ea…

c7951bd

…ch other and make more similar to amp-story design in browser.

Add inserter for grid layers.

4fa18d3

Fix style for fill template. Remove importing lodash since it breaks …

bfdefb9

…media loader.

Fix eslint.

cd4d801

Add CTA Layer to the block inserter dropdown.

b9b410c

miina commented Aug 22, 2018

View reviewed changes

miina added 3 commits August 23, 2018 19:32

Extend blocks to allow configuring the position in thirds template.

e5c84d0

Merge branch 'amp-stories' into amp-story/layouts

912439d

Add a partly working workaround for selectBlock issue.

6ff0bf6

miina changed the title ~~[WIP] [amp-stories sub-task] Grid layers layout~~ [amp-stories sub-task] Grid layers layout Aug 29, 2018

miina commented Aug 29, 2018

View reviewed changes

Merge amp-stories and resolve conflicts.

b486847

westonruter added 2 commits August 29, 2018 12:15

Ensure a singular AMP story always is_amp_endpoint

b7afb23

Ensure amp-runtime and Gutenberg block styles are included on story t…

dc87187

…emplate

westonruter merged commit 6eca68b into amp-stories Aug 29, 2018

westonruter deleted the amp-story/layouts branch August 29, 2018 19:25

westonruter added the AMP Stories (obsolete) label Mar 22, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[amp-stories sub-task] Grid layers layout #1347

[amp-stories sub-task] Grid layers layout #1347

miina commented Aug 20, 2018

miina Aug 21, 2018

westonruter Aug 21, 2018

westonruter Aug 21, 2018

westonruter Aug 21, 2018

westonruter Aug 21, 2018

westonruter Aug 21, 2018

westonruter Aug 21, 2018

westonruter Aug 21, 2018

westonruter Aug 21, 2018

miina Aug 22, 2018

westonruter Aug 23, 2018

miina Aug 29, 2018

miina commented Aug 29, 2018

westonruter commented Aug 29, 2018

miina commented Aug 29, 2018

westonruter commented Aug 29, 2018

westonruter commented Aug 29, 2018

[amp-stories sub-task] Grid layers layout #1347

[amp-stories sub-task] Grid layers layout #1347

Conversation

miina commented Aug 20, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

miina commented Aug 29, 2018

westonruter commented Aug 29, 2018

miina commented Aug 29, 2018

westonruter commented Aug 29, 2018

Backend

Frontend

westonruter commented Aug 29, 2018