Merge branch 'develop' of https://github.com/ampproject/amp-wp into u…

…pdate/support-links
ampproject · Nov 11, 2024 · 14c15c5 · 14c15c5
2 parents 3bbffa2 + 6386882
commit 14c15c5
Show file tree

Hide file tree

Showing 13 changed files with 2,428 additions and 1,234 deletions.
diff --git a/assets/src/block-editor/blocks/amp-brid-player/edit.js b/assets/src/block-editor/blocks/amp-brid-player/edit.js
@@ -98,6 +98,7 @@ const BlockEdit = (props) => {
 						label={__('Autoplay', 'amp')}
 						checked={autoPlay}
 						onChange={() => setAttributes({ autoPlay: !autoPlay })}
+						__nextHasNoMarginBottom={true}
 					/>
 					<LayoutControls
 						{...props}

diff --git a/assets/src/block-editor/blocks/amp-ima-video/edit.js b/assets/src/block-editor/blocks/amp-ima-video/edit.js
@@ -66,6 +66,7 @@ const BlockEdit = (props) => {
 								dataDelayAdRequest: !dataDelayAdRequest,
 							})
 						}
+						__nextHasNoMarginBottom={true}
 					/>
 					<LayoutControls
 						{...props}

diff --git a/assets/src/block-editor/blocks/amp-mathml/index.js b/assets/src/block-editor/blocks/amp-mathml/index.js
@@ -17,7 +17,7 @@ export const settings = {
 	icon: 'welcome-learn-more',
 	keywords: [
 		__('Mathematical formula', 'amp'),
-		__('Scientific content ', 'amp'),
+		__('Scientific content', 'amp'),
 	],
 
 	attributes: {

diff --git a/assets/src/block-editor/blocks/amp-o2-player/edit.js b/assets/src/block-editor/blocks/amp-o2-player/edit.js
@@ -69,6 +69,7 @@ const BlockEdit = (props) => {
 						label={__('Autoplay', 'amp')}
 						checked={autoPlay}
 						onChange={() => setAttributes({ autoPlay: !autoPlay })}
+						__nextHasNoMarginBottom={true}
 					/>
 					<LayoutControls
 						{...props}

diff --git a/assets/src/block-editor/helpers/index.js b/assets/src/block-editor/helpers/index.js
@@ -254,6 +254,7 @@ const AmpLightboxToggle = (props) => {
 					setAttributes({ linkTo: 'none' });
 				}
 			}}
+			__nextHasNoMarginBottom={true}
 		/>
 	);
 };
@@ -286,6 +287,7 @@ const AmpCarouselToggle = (props) => {
 			label={__('Display as carousel', 'amp')}
 			checked={ampCarousel}
 			onChange={() => setAttributes({ ampCarousel: !ampCarousel })}
+			__nextHasNoMarginBottom={true}
 		/>
 	);
 };

diff --git a/assets/src/components/amp-setting-toggle/index.js b/assets/src/components/amp-setting-toggle/index.js
@@ -51,6 +51,7 @@ export function AMPSettingToggle({
 					</div>
 				}
 				onChange={onChange}
+				__nextHasNoMarginBottom={true}
 			/>
 		</div>
 	);

diff --git a/assets/src/components/amp-setting-toggle/test/__snapshots__/index.js.snap b/assets/src/components/amp-setting-toggle/test/__snapshots__/index.js.snap
diff --git a/assets/src/components/dev-tools-toggle/test/__snapshots__/index.js.snap b/assets/src/components/dev-tools-toggle/test/__snapshots__/index.js.snap
diff --git a/assets/src/components/redirect-toggle/test/__snapshots__/redirect-toggle.js.snap b/assets/src/components/redirect-toggle/test/__snapshots__/redirect-toggle.js.snap
diff --git a/assets/src/settings-page/paired-url-structure.js b/assets/src/settings-page/paired-url-structure.js
@@ -220,7 +220,7 @@ function SlugConflictsNotice({ slug, conflicts }) {
 
 				{conflicts.rewrite && (
 					<li>
-						{__('Rewrite rules: ', 'amp')}
+						{__('Rewrite rules:', 'amp')}
 						{conflicts.rewrite
 							.map((entity) => <code key={entity}>{entity}</code>)
 							.reduce((prev, curr) => [prev, ', ', curr])}
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,7 @@ export function AMPSettingToggle({ @@
     					</div>
     				}
     				onChange={onChange}
+    				__nextHasNoMarginBottom={true}
     			/>
     		</div>
     	);
@@ Expand Down @@