reduce code duplication in _blocks.scss

css/custom-editor-style-bootstrap4.css

@@ -674,16 +674,19 @@ template {
   height: auto;
 }
 
-.figure, .wp-block-image > figure, figure.wp-block-image {
+.figure, figure.wp-block-image,
+.wp-block-image > figure {
   display: inline-block;
 }
 
-.figure-img, .wp-block-image > figure img, figure.wp-block-image img {
+.figure-img, figure.wp-block-image img,
+.wp-block-image > figure img {
   margin-bottom: 0.5rem;
   line-height: 1;
 }
 
-.figure-caption, .wp-block-image > figure figcaption, figure.wp-block-image figcaption {
+.figure-caption, figure.wp-block-image figcaption,
+.wp-block-image > figure figcaption {
   font-size: 90%;
   color: #6c757d;
 }
@@ -5295,9 +5298,7 @@ a.text-dark:hover, a.text-dark:focus {
   color: #343a40;
 }
 
-figure.wp-block-image {
-  display: block;
-}
+figure.wp-block-image,
 .wp-block-image > figure {
   display: block;
 }

css/custom-editor-style.css

@@ -689,16 +689,19 @@ progress {
   height: auto;
 }
 
-.figure, .wp-block-image > figure, figure.wp-block-image {
+.figure, figure.wp-block-image,
+.wp-block-image > figure {
   display: inline-block;
 }
 
-.figure-img, .wp-block-image > figure img, figure.wp-block-image img {
+.figure-img, figure.wp-block-image img,
+.wp-block-image > figure img {
   margin-bottom: 0.5rem;
   line-height: 1;
 }
 
-.figure-caption, .wp-block-image > figure figcaption, figure.wp-block-image figcaption {
+.figure-caption, figure.wp-block-image figcaption,
+.wp-block-image > figure figcaption {
   font-size: 0.875em;
   color: #6c757d;
 }
@@ -5972,9 +5975,7 @@ progress {
   color: #212529;
 }
 
-figure.wp-block-image {
-  display: block;
-}
+figure.wp-block-image,
 .wp-block-image > figure {
   display: block;
 }

css/theme-bootstrap4.css

@@ -481,16 +481,19 @@ mark,
   height: auto;
 }
 
-.figure, .wp-block-image > figure, figure.wp-block-image {
+.figure, figure.wp-block-image,
+.wp-block-image > figure {
   display: inline-block;
 }
 
-.figure-img, .wp-block-image > figure img, figure.wp-block-image img {
+.figure-img, figure.wp-block-image img,
+.wp-block-image > figure img {
   margin-bottom: 0.5rem;
   line-height: 1;
 }
 
-.figure-caption, .wp-block-image > figure figcaption, figure.wp-block-image figcaption {
+.figure-caption, figure.wp-block-image figcaption,
+.wp-block-image > figure figcaption {
   font-size: 90%;
   color: #6c757d;
 }
@@ -14352,7 +14355,6 @@ article img,
   display: block;
 }
 
-/* Search Widget */
 .wp-block-search .wp-block-search__label {
   position: absolute;
   width: 1px;
@@ -14707,9 +14709,7 @@ article img,
   color: #343a40;
 }
 
-figure.wp-block-image {
-  display: block;
-}
+figure.wp-block-image,
 .wp-block-image > figure {
   display: block;
 }

css/theme.css

@@ -607,16 +607,19 @@ progress {
   height: auto;
 }
 
-.figure, .wp-block-image > figure, figure.wp-block-image {
+.figure, figure.wp-block-image,
+.wp-block-image > figure {
   display: inline-block;
 }
 
-.figure-img, .wp-block-image > figure img, figure.wp-block-image img {
+.figure-img, figure.wp-block-image img,
+.wp-block-image > figure img {
   margin-bottom: 0.5rem;
   line-height: 1;
 }
 
-.figure-caption, .wp-block-image > figure figcaption, figure.wp-block-image figcaption {
+.figure-caption, figure.wp-block-image figcaption,
+.wp-block-image > figure figcaption {
   font-size: 0.875em;
   color: #6c757d;
 }
@@ -12987,7 +12990,6 @@ article img,
   display: block;
 }
 
-/* Search Widget */
 .wp-block-search .wp-block-search__label {
   position: absolute !important;
   width: 1px !important;
@@ -13332,9 +13334,7 @@ article img,
   color: #212529;
 }
 
-figure.wp-block-image {
-  display: block;
-}
+figure.wp-block-image,
 .wp-block-image > figure {
   display: block;
 }

src/sass/theme/_blocks.scss

@@ -12,8 +12,10 @@
 	}
 }
 
-// Image captions
-figure.wp-block-image {
+
+figure.wp-block-image, // Image captions
+.wp-block-image > figure // Alternate/classic editor image captions
+{
 	@extend .figure;
 	display: block;
 	img {
@@ -24,19 +26,6 @@ figure.wp-block-image {
 	}
 }
 
-// Alternate/classic editor image captions.
-.wp-block-image > figure {
-	@extend .figure;
-	display: block;
-	img {
-		@extend .figure-img;
-	}
-	figcaption {
-		@extend .figure-caption;
-	}
-}
-
-
 // Wide alignments and covers.
 body.understrap-no-sidebar {
 	.alignwide,