Feelin'Good: Prepare for the submission. (#7770)

* Feelin'Good: Prepare for the submission.

* Feelin'Good: more clean up

feelingood/functions.php

@@ -1,11 +1,11 @@
 <?php
 /**
- * Feelin' Good functions and definitions
+ * Feelin'Good functions and definitions
  *
  * @link https://developer.wordpress.org/themes/basics/theme-functions/
  *
- * @package Feelin' Good
- * @since Feelin' Good 1.0
+ * @package Feelin'Good
+ * @since Feelin'Good 1.0
  */
 declare( strict_types = 1 );
 
@@ -14,7 +14,7 @@ if ( ! function_exists( 'feelingood_support' ) ) :
 	/**
 	 * Sets up theme defaults and registers support for various WordPress functionalities.
 	 *
-	 * @since Feelin' Good 1.0
+	 * @since Feelin'Good 1.0
 	 *
 	 * @return void
 	 */
@@ -36,7 +36,7 @@ if ( ! function_exists( 'feelingood_styles' ) ) :
 	/**
 	 * Enqueue styles.
 	 *
-	 * @since Feelin' Good 1.0
+	 * @since Feelin'Good 1.0
 	 *
 	 * @return void
 	 */
@@ -63,7 +63,7 @@ add_action( 'wp_enqueue_scripts', 'feelingood_styles' );
  * Temporaly fix for disabling the default font sizes.
  * https://github.com/WordPress/gutenberg/issues/52200
  *
- * @since Feelin' Good 1.0
+ * @since Feelin'Good 1.0
  *
  * @return void
  */

feelingood/parts/comments.html

@@ -7,23 +7,17 @@
 		<!-- wp:group {"layout":{"type":"default"}} -->
 		<div class="wp-block-group">
 			<!-- wp:comment-template {"style":{"spacing":{"padding":{"left":"0px"}}}} -->
-				<!-- wp:group {"style":{"spacing":{"margin":{"top":"0","bottom":"var:preset|spacing|60"}}}} -->
-				<div class="wp-block-group" style="margin-top:0;margin-bottom:var(--wp--preset--spacing--60)">
+				<!-- wp:group {"style":{"spacing":{"margin":{"top":"0","bottom":"var:preset|spacing|50"}}}} -->
+				<div class="wp-block-group" style="margin-top:0;margin-bottom:var(--wp--preset--spacing--50)">
 					<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|40"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
 					<div class="wp-block-group">
 						<!-- wp:avatar {"size":48} /-->
 
-						<!-- wp:group -->
+						<!-- wp:group {"style":{"spacing":{"blockGap":"0"}}} -->
 						<div class="wp-block-group">
 							<!-- wp:comment-author-name /-->
 
-							<!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5em"}},"layout":{"type":"flex"}} -->
-							<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px">
-								<!-- wp:comment-date {"format":"F j, Y \\a\\t g:i a"} /-->
-
-								<!-- wp:comment-edit-link /-->
-							</div>
-							<!-- /wp:group -->
+							<!-- wp:comment-date {"format":"F j, Y \\a\\t g:i a"} /-->
 						</div>
 						<!-- /wp:group -->
 					</div>
@@ -31,10 +25,26 @@
 
 					<!-- wp:comment-content /-->
 
-					<!-- wp:comment-reply-link /-->
+					<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex"}} -->
+					<div class="wp-block-group">
+						<!-- wp:comment-reply-link /-->
+
+						<!-- wp:comment-edit-link /-->
+					</div>
+					<!-- /wp:group -->
 				</div>
 				<!-- /wp:group -->
 			<!-- /wp:comment-template -->
+
+			<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|50"}}},"layout":{"type":"constrained"}} -->
+			<div class="wp-block-group" style="margin-bottom:var(--wp--preset--spacing--50)">
+				<!-- wp:comments-pagination {"paginationArrow":"arrow","layout":{"type":"flex","justifyContent":"space-between"}} -->
+					<!-- wp:comments-pagination-previous /-->
+
+					<!-- wp:comments-pagination-next /-->
+				<!-- /wp:comments-pagination -->
+			</div>
+			<!-- /wp:group -->
 		</div>
 		<!-- /wp:group -->
 

feelingood/readme.txt

@@ -1,21 +1,18 @@
-=== Feelin' Good ===
+=== Feelin'Good ===
 Contributors: 
 Requires at least: 6.0
-Tested up to: 6.4.3
+Tested up to: 6.5
 Requires PHP: 5.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
 == Description ==
 
-Feelin' Good is blog theme with a bold vaporwave aesthetic. Its nostalgic atmosphre pays homage to the 90s.
+Feelin'Good is blog theme with a bold vaporwave aesthetic. Its nostalgic atmosphre pays homage to the 90s.
 
 
 == Changelog ==
 
-= 1.0.1 =
-* Lossless image optimization (#7671)
-
 = 1.0.1 =
 * Optimize images (#7671)
 
@@ -24,8 +21,8 @@ Feelin' Good is blog theme with a bold vaporwave aesthetic. Its nostalgic atmosp
 
 == Copyright ==
 
-Feelin' Good WordPress Theme (C) 2023 Automattic
-Feelin' Good is distributed under the terms of the GNU GPL.
+Feelin'Good WordPress Theme (C) 2023 Automattic
+Feelin'Good is distributed under the terms of the GNU GPL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -53,12 +50,15 @@ License URL: https://scripts.sil.org/OFL
 Source: https://fonts.google.com/
 -- End of Libre Caslon Condensed Font credits --
 
+Noto Sans Japanese Font
+Copyright 2017 The Noto Sans Japanese Authors (https://fonts.google.com/noto/specimen/Noto+Sans+JP)
+This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is available with a FAQ at: https://scripts.sil.org/OFL
+License URL: https://scripts.sil.org/OFL
+-- End of Noto Sans Japanese Font credits --
+
 Included in the template:
 Constantine's hand I by Nick Thompson
 CC BY-NC 2.0 DEED
 https://www.flickr.com/photos/33563858@N00/344403443
 
 Any other images were generated by Midjourney.
-
-
-

feelingood/style.css

@@ -1,17 +1,17 @@
 /*
-Theme Name: Feelin' Good
+Theme Name: Feelin'Good
 Theme URI: https://wordpress.com/theme/feelingood/
 Author: Automattic
 Author URI: https://automattic.com/
 Description: A blog theme with a bold vaporwave aesthetic. Its nostalgic atmosphere pays homage to the 80s and early 90s.
 Requires at least: 6.0
-Tested up to: 6.4
+Tested up to: 6.5
 Requires PHP: 5.7
 Version: 1.0.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: feelingood
-Tags: blog, one-column, block-styles, featured-images, full-site-editing, rtl-language-support, style-variations, threaded-comments, translation-ready, entertainment, block-patterns
+Tags: blog, one-column,block-patterns, block-styles, featured-images, full-site-editing, rtl-language-support, threaded-comments, translation-ready
 */
 
 /*

feelingood/theme.json

@@ -65,38 +65,38 @@
 			},
 			"spacingSizes": [
 				{
-					"name": "1",
+					"name": "X-Small",
 					"size": "0.25rem",
 					"slug": "20"
 				},
 				{
-					"name": "2",
+					"name": "Small",
 					"size": "0.75rem",
 					"slug": "30"
 				},
 				{
-					"name": "3",
+					"name": "Medium",
 					"size": "1.125rem",
 					"slug": "40"
 				},
 				{
-					"name": "4",
-					"size": "clamp(1.125rem, 4.7682119vw, 2.25rem)",
+					"name": "Large",
+					"size": "clamp(1.125rem, 5.2708638vw, 2.25rem)",
 					"slug": "50"
 				},
 				{
-					"name": "5",
-					"size": "clamp(1.6875rem, 7.1523179vw, 3.375rem)",
+					"name": "X-Large",
+					"size": "clamp(1.6875rem, 7.9062958vw, 3.375rem)",
 					"slug": "60"
 				},
 				{
-					"name": "6",
-					"size": "clamp(2.25rem, 9.5364238vw, 4.5rem)",
+					"name": "2X-Large",
+					"size": "clamp(2.25rem, 10.5417277vw, 4.5rem)",
 					"slug": "70"
 				},
 				{
-					"name": "7",
-					"size": "clamp(2.8125rem, 11.9205298vw, 5.625rem)",
+					"name": "3X-Large",
+					"size": "clamp(2.8125rem, 13.1771596vw, 5.625rem)",
 					"slug": "80"
 				}
 			],
@@ -167,7 +167,7 @@
 			],
 			"fontSizes": [
 				{
-					"fluid": false,
+					"fluid": "false",
 					"name": "Extra Small",
 					"size": "0.72rem",
 					"slug": "x-small"
@@ -231,14 +231,15 @@
 			"fontWeight": true,
 			"letterSpacing": true,
 			"textDecoration": true,
-			"textTransform": true
+			"textTransform": true,
+			"writingMode": true
 		},
 		"useRootPaddingAwareAlignments": true
 	},
 	"styles": {
 		"blocks": {
 			"core/archives": {
-				"css": "& {list-style-type:none;}",
+				"css": "{list-style-type:none;}",
 				"elements": {
 					"link": {
 						":hover": {
@@ -292,7 +293,7 @@
 				"css": ".wp-block-calendar table:where(:not(.has-text-color)) {color: var(--wp--preset--color--contrast);} &.wp-block-calendar table:where(:not(.has-text-color)) td {border-color: var(--wp--preset--color--contrast);} &.wp-block-calendar table:where(:not(.has-text-color)) th {border-color: var(--wp--preset--color--contrast);} & :where(.wp-block-calendar table:not(.has-background) th) {background-color: var(--wp--preset--color--contrast);color: var(--wp--preset--color--base);}"
 			},
 			"core/categories": {
-				"css": "& {list-style-type:none;}",
+				"css": "{list-style-type:none;}",
 				"elements": {
 					"link": {
 						":hover": {
@@ -331,7 +332,13 @@
 				}
 			},
 			"core/column": [],
-			"core/columns": [],
+			"core/columns": {
+				"spacing": {
+					"margin": {
+						"bottom": "0"
+					}
+				}
+			},
 			"core/comment-author-name": {
 				"elements": {
 					"link": {
@@ -346,11 +353,11 @@
 					}
 				},
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontSize": "var(--wp--preset--font-size--medium)"
 				}
 			},
 			"core/comment-content": {
-				"css": "& p{margin-bottom:0;} & p+p{margin-top:var(--wp--preset--spacing--50)}"
+				"css": " p{margin-bottom:0;} & p+p{margin-top:var(--wp--preset--spacing--40)}"
 			},
 			"core/comment-date": {
 				"elements": {
@@ -366,27 +373,49 @@
 					}
 				},
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontSize": "var(--wp--preset--font-size--medium)"
 				}
 			},
 			"core/comment-edit-link": {
+				"css": " a{display: block;}",
 				"elements": {
 					"link": {
+						":focus": {
+							"color": {
+								"background": "var(--wp--preset--color--accent-two)",
+								"text": "var(--wp--preset--color--primary)"
+							}
+						},
 						":hover": {
-							"typography": {
-								"textDecoration": "underline"
+							"color": {
+								"background": "var(--wp--preset--color--accent-two)",
+								"text": "var(--wp--preset--color--primary)"
 							}
 						},
+						"border": {
+							"radius": "999px"
+						},
+						"color": {
+							"background": "var(--wp--preset--color--secondary)",
+							"text": "var(--wp--preset--color--primary)"
+						},
+						"shadow": "var( --wp--preset--shadow--buttons )",
+						"spacing": {
+							"padding": "0.3rem 0.9rem"
+						},
 						"typography": {
-							"textDecoration": "none"
+							"fontSize": "var(--wp--preset--font-size--small)",
+							"fontStyle": "italic",
+							"fontWeight": "600",
+							"lineHeight": "1",
+							"textDecoration": "none",
+							"textTransform": "uppercase"
 						}
 					}
-				},
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"core/comment-reply-link": {
+				"css": " a{display: block;}",
 				"elements": {
 					"link": {
 						":focus": {
@@ -410,7 +439,7 @@
 						},
 						"shadow": "var( --wp--preset--shadow--buttons )",
 						"spacing": {
-							"padding": "0.328125rem 0.65625rem"
+							"padding": "0.3rem 0.9rem"
 						},
 						"typography": {
 							"fontSize": "var(--wp--preset--font-size--small)",
@@ -426,6 +455,7 @@
 			"core/comment-template": [],
 			"core/comments": [],
 			"core/comments-pagination": {
+				"css": " a.wp-block-comments-pagination-previous{margin-bottom:0;} & a.wp-block-comments-pagination-next{margin-bottom:0;} & a.wp-block-comments-pagination-numbers{margin-bottom:0;}",
 				"elements": {
 					"link": {
 						":hover": {
@@ -446,7 +476,7 @@
 				"spacing": {
 					"margin": {
 						"bottom": "0",
-						"top": "var(--wp--preset--spacing--50)"
+						"top": "var(--wp--style--block-gap)"
 					}
 				},
 				"typography": {
@@ -458,7 +488,7 @@
 					"text": "var(--wp--preset--color--contrast)"
 				},
 				"spacing": {
-					"padding": "var(--wp--preset--spacing--50)"
+					"padding": "var(--wp--style--block-gap)"
 				}
 			},
 			"core/details": [],
@@ -473,7 +503,19 @@
 				"css": " .wp-element-caption{text-align:center;}"
 			},
 			"core/latest-comments": {
-				"css": "& .wp-block-latest-comments__comment-meta{font-size: inherit;} & .wp-block-latest-comments__comment-date{font-size: inherit;} & .wp-block-latest-comments__comment-excerpt p{font-size: inherit;} & .wp-block-latest-comments__comment-excerpt p{margin:0 0 var(--wp--style--block-gap)} &:where(.wp-block-latest-comments:not([style*=line-height] .wp-block-latest-comments__comment-excerpt p)){line-height:calc(1em + 0.375rem);} & .avatar, .wp-block-latest-comments__comment-avatar{border-radius:0;border-radius:999px;}",
+				"css": " .wp-block-latest-comments__comment-meta{font-size: inherit;} & .wp-block-latest-comments__comment-date, .wp-block-latest-comments__comment-excerpt p{font-size: inherit;margin:0} &:where(.wp-block-latest-comments:not([style*=line-height] .wp-block-latest-comments__comment-excerpt p)){line-height:calc(1em + 0.375rem);} & .wp-block-latest-comments__comment-avatar{border-radius:0;border-radius:999px;}",
+				"elements": {
+					"link": {
+						":hover": {
+							"typography": {
+								"textDecoration": "underline"
+							}
+						},
+						"typography": {
+							"textDecoration": "none"
+						}
+					}
+				},
 				"spacing": {
 					"padding": {
 						"left": "0px"
@@ -481,12 +523,24 @@
 				}
 			},
 			"core/latest-posts": {
-				"css": " .wp-block-latest-posts__post-author{font-size: inherit;} & .wp-block-latest-posts__post-date{font-size: inherit;} & .wp-block-latest-posts__post-excerpt{margin:0 0 var(--wp--style--block-gap)}"
+				"css": " .wp-block-latest-posts__post-author, .wp-block-latest-posts__post-date {font-size: inherit;} & .wp-block-latest-posts__post-excerpt{margin:0 0 var(--wp--style--block-gap)}",
+				"elements": {
+					"link": {
+						":hover": {
+							"typography": {
+								"textDecoration": "underline"
+							}
+						},
+						"typography": {
+							"textDecoration": "none"
+						}
+					}
+				}
 			},
 			"core/list": {
 				"spacing": {
 					"padding": {
-						"left": "var(--wp--preset--spacing--50)"
+						"left": "var(--wp--preset--spacing--40)"
 					}
 				}
 			},
@@ -500,14 +554,9 @@
 				}
 			},
 			"core/navigation-link": [],
-			"core/navigation-submenu": {
-				"spacing": {
-					"padding": {
-						"top": "0"
-					}
-				}			},
+			"core/navigation-submenu": [],
 			"core/page-list": {
-				"css": "& {list-style-type:none;}",
+				"css": "{list-style-type:none;}",
 				"elements": {
 					"link": {
 						":hover": {
@@ -533,17 +582,12 @@
 				}
 			},
 			"core/post-author": {
-				"css": ".wp-block-post-author .wp-block-post-author__byline{font-size:inherit;}&.wp-block-post-author .wp-block-post-author__name a{text-decoration:none;}&.wp-block-post-author .wp-block-post-author__bio{font-size:inherit;margin:0;}& .wp-block-post-author__avatar img{border-radius: 999px;vertical-align:middle;}"
+				"css": " .wp-block-post-author__byline, .wp-block-post-author__name, .wp-block-post-author__bio{font-size:inherit;} & .wp-block-post-author__name a{text-decoration:none;} & .wp-block-post-author__avatar img{border-radius:999px;} & .wp-block-post-author__bio{margin:0;}"
 			},
 			"core/post-author-biography": [],
 			"core/post-author-name": {
 				"elements": {
 					"link": {
-						":focus": {
-							"typography": {
-								"textDecoration": "underline"
-							}
-						},
 						":hover": {
 							"typography": {
 								"textDecoration": "underline"
@@ -564,16 +608,14 @@
 				}
 			},
 			"core/post-comments-form": {
-				"css": ".wp-block-post-comments-form .comment-reply-title{margin-top:0;} & .comment-form input:not([type=submit]):not([type=checkbox]){line-height: inherit;} & .comment-form textarea{line-height: inherit;} & .comment-form > *{margin-top:var(--wp--style--block-gap);margin-bottom:0} & .form-submit {margin-bottom: 0; & input[type=submit]{box-shadow:var( --wp--preset--shadow--buttons );}"
+				"css": " .comment-form input:not([type=submit]):not([type=checkbox]){line-height:inherit;} & .comment-form textarea{line-height:inherit;} & .comment-form > *{margin-top:var(--wp--style--block-gap);margin-bottom:0} & .comment-reply-title{margin-top:var(--wp--style--block-gap);} & .form-submit {margin-bottom: 0; & input[type=submit]{box-shadow:var( --wp--preset--shadow--buttons );}",
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--small)"
+				}
 			},
 			"core/post-comments-link": {
 				"elements": {
 					"link": {
-						":focus": {
-							"typography": {
-								"textDecoration": "underline"
-							}
-						},
 						":hover": {
 							"typography": {
 								"textDecoration": "underline"
@@ -589,7 +631,7 @@
 				}
 			},
 			"core/post-content": {
-				"css": ".wp-block-post-content > p{text-indent:30px}",
+				"css": " > p:not(.wp-block-site-tagline):not(.wp-block-tag-cloud){text-indent:1.875rem}",
 				"elements": {
 					"heading": {
 						"spacing": {
@@ -630,7 +672,19 @@
 				}
 			},
 			"core/post-excerpt": {
-				"css": ".wp-block-post-excerpt .wp-block-post-excerpt__excerpt{text-indent:30px}"
+				"css": ".wp-block-post-excerpt .wp-block-post-excerpt__excerpt{text-indent:1.875rem;}",
+				"elements": {
+					"link": {
+						":hover": {
+							"typography": {
+								"textDecoration": "underline"
+							}
+						},
+						"typography": {
+							"textDecoration": "none"
+						}
+					}
+				}
 			},
 			"core/post-featured-image": {
 				"border": {
@@ -664,7 +718,7 @@
 					"background": "var(--wp--preset--color--secondary)",
 					"text": "var(--wp--preset--color--primary)"
 				},
-				"css": ".wp-block-post-navigation-link:empty{padding:0;}",
+				"css": ":empty{padding:0;}",
 				"elements": {
 					"link": {
 						":focus": {
@@ -685,7 +739,7 @@
 						}
 					}
 				},
-				"shadow": "var( --wp--preset--shadow--buttons )",
+				"shadow": "var(--wp--preset--shadow--buttons)",
 				"spacing": {
 					"padding": {
 						"bottom": "0.6875rem",
@@ -704,6 +758,7 @@
 			},
 			"core/post-template": [],
 			"core/post-terms": {
+				"css": ".taxonomy-post_tag a:before{content:'#';}",
 				"color": {
 					"text": "var(--wp--preset--color--contrast)"
 				},
@@ -769,13 +824,13 @@
 					"style": "solid",
 					"width": "1px 0"
 				},
-				"css": ".wp-block-pullquote cite {display:block;margin-top: var(--wp--preset--spacing--50)}",
+				"css": " cite {display:block;margin-top: var(--wp--preset--spacing--40)}",
 				"spacing": {
 					"padding": {
-						"bottom": "var(--wp--preset--spacing--50)",
-						"left": "var(--wp--preset--spacing--50)",
-						"right": "var(--wp--preset--spacing--50)",
-						"top": "var(--wp--preset--spacing--50)"
+						"bottom": "var(--wp--preset--spacing--40)",
+						"left": "var(--wp--preset--spacing--40)",
+						"right": "var(--wp--preset--spacing--40)",
+						"top": "var(--wp--preset--spacing--40)"
 					}
 				},
 				"typography": {
@@ -858,13 +913,14 @@
 					"style": "solid",
 					"width": "0 0 0 1px"
 				},
+				"css": ".is-style-plain cite{font-style:normal;}",
 				"spacing": {
 					"margin": {
 						"left": "0",
 						"right": "0"
 					},
 					"padding": {
-						"left": "var(--wp--preset--spacing--50)"
+						"left": "var(--wp--preset--spacing--40)"
 					}
 				},
 				"typography": {
@@ -887,12 +943,25 @@
 				}
 			},
 			"core/read-more": [],
-			"core/rss": [],
+			"core/rss": {
+				"elements": {
+					"link": {
+						":hover": {
+							"typography": {
+								"textDecoration": "underline"
+							}
+						},
+						"typography": {
+							"textDecoration": "none"
+						}
+					}
+				}
+			},
 			"core/search": {
 				"border": {
 					"radius": "999px"
 				},
-				"css": "& :where(.wp-block-search__button-inside .wp-block-search__inside-wrapper){background-color:#fff;} & :where(.wp-block-search__button-inside .wp-block-search__inside-wrapper) .wp-block-search__input{padding: 0 8px;} & .wp-block-search__button{margin-bottom:0;}",
+				"css": " :where(.wp-block-search__button-inside .wp-block-search__inside-wrapper){background-color:#fff;} & .wp-block-search__button.has-icon{padding:1rem;",
 				"typography": {
 					"lineHeight": "1"
 				}
@@ -929,6 +998,7 @@
 					}
 				},
 				"typography": {
+					"fontSize": "var(--wp--preset--font-size--medium)",
 					"lineHeight": "1"
 				}
 			},
@@ -942,7 +1012,7 @@
 			},
 			"core/spacer": [],
 			"core/table": {
-				"css": "& thead{border-bottom-width: 1px;} & tfoot{border-top-width: 1px;} & + .wp-element-caption{text-align:center;}"
+				"css": " thead{border-bottom-width: 1px;} & tfoot{border-top-width: 1px;} & + .wp-element-caption{text-align:center;}"
 			},
 			"core/table-of-contents": {
 				"elements": {
@@ -959,7 +1029,19 @@
 				}
 			},
 			"core/tag-cloud": {
-				"css": ".wp-block-tag-cloud.is-style-outline{font-size:var(--wp--preset--font-size--small)} &.wp-block-tag-cloud.is-style-outline a {padding: 2px 8px 0;} &.wp-block-tag-cloud.is-style-outline a:hover {color: var(--wp--preset--color--base);background-color: var(--wp--preset--color--primary);} &.wp-block-tag-cloud{text-indent:0!important;}"
+				"css": ".is-style-outline{font-size:var(--wp--preset--font-size--small);line-height:1;} &.is-style-outline a {border-radius:999px;padding: 0.3125rem 1rem 0.1875rem;} &.is-style-outline a:hover {color: var(--wp--preset--color--base);background-color: var(--wp--preset--color--primary);}",
+				"elements": {
+					"link": {
+						":hover": {
+							"typography": {
+								"textDecoration": "underline"
+							}
+						},
+						"typography": {
+							"textDecoration": "none"
+						}
+					}
+				}
 			},
 			"core/term-description": {
 				"css": "& p+p {margin-top:var(--wp--preset--spacing--40);}"
@@ -971,6 +1053,7 @@
 			"background": "var(--wp--preset--color--base)",
 			"text": "var(--wp--preset--color--contrast)"
 		},
+		"css": ".no-underline a{text-decoration: none;}",
 		"elements": {
 			"button": {
 				":focus": {
@@ -1011,12 +1094,12 @@
 			"caption": {
 				"spacing": {
 					"margin": {
-						"bottom": "var(--wp--preset--spacing--50)",
+						"bottom": "var(--wp--preset--spacing--40)",
 						"top": "var(--wp--preset--spacing--30)"
 					},
 					"padding": {
-						"left": "var(--wp--preset--spacing--50)",
-						"right": "var(--wp--preset--spacing--50)"
+						"left": "var(--wp--preset--spacing--40)",
+						"right": "var(--wp--preset--spacing--40)"
 					}
 				},
 				"typography": {