Merge pull request Automattic#1172 from Automattic/master

Release – Dec. 8
jhalitschke · Dec 8, 2020 · 8b3d43c · 8b3d43c
2 parents 9a310ee + f8c51b5
commit 8b3d43c
Show file tree

Hide file tree

Showing 35 changed files with 3,018 additions and 1,396 deletions.
diff --git a/newspack-joseph/inc/child-typography.php b/newspack-joseph/inc/child-typography.php
@@ -17,7 +17,7 @@ function newspack_joseph_custom_typography_css() {
 	if ( get_theme_mod( 'font_header', '' ) ) {
 		$css_blocks .= '
 			.has-drop-cap:not(:focus)::first-letter,
-			.entry .entry-content .wp-block-pullquote {
+			.wp-block-pullquote {
 				font-family: ' . wp_kses( $font_header, null ) . ';
 			}
 
@@ -35,7 +35,7 @@ function newspack_joseph_custom_typography_css() {
 			.widget,
 			.widget-title.accent-header,
 			.accent-header,
-			.entry .entry-content .wp-block-button__link,
+			.wp-block-button .wp-block-button__link,
 			.entry .article-section-title,
 			button,
 			input[type="button"],

diff --git a/newspack-joseph/sass/style.scss b/newspack-joseph/sass/style.scss
@@ -104,7 +104,7 @@ figcaption,
 .widget,
 .widget-title.accent-header,
 .accent-header,
-.entry .entry-content .wp-block-button .wp-block-button__link,
+.wp-block-button__link,
 .entry .article-section-title,
 button,
 input[type='button'],
@@ -372,17 +372,15 @@ textarea {
 }
 
 /* Blocks */
-.entry .entry-content {
-	.wp-block-separator,
-	hr {
-		background: transparent !important;
-		border-color: currentColor;
-		border-top-style: double;
-		border-top-width: 3px;
-
-		&.is-style-dots::before {
-			color: currentColor;
-		}
+.wp-block-separator,
+hr {
+	background: transparent !important;
+	border-color: currentColor;
+	border-top-style: double;
+	border-top-width: 3px;
+
+	&.is-style-dots::before {
+		color: currentColor;
 	}
 }
 

diff --git a/newspack-katharine/inc/child-color-patterns.php b/newspack-katharine/inc/child-color-patterns.php
@@ -32,8 +32,8 @@ function newspack_katharine_custom_colors_css() {
 
 	$theme_css = '
 		.archive .page-title,
-		.entry-meta .byline a, .entry-meta .byline a:visited,
-		.entry .entry-content .entry-meta .byline a, .entry .entry-content .entry-meta .byline a:visited,
+		.entry-meta .byline a,
+		.entry-meta .byline a:visited,
 		.entry .entry-meta a:hover,
 		.cat-links,
 		.cat-links a,
@@ -49,7 +49,7 @@ function newspack_katharine_custom_colors_css() {
 		}
 
 		.accent-header:before,
-		.site-content .wpnbha .article-section-title:before,
+		div.wpnbha .article-section-title:before,
 		.cat-links:before,
 		.archive .page-title:before,
 		figcaption:after,

diff --git a/newspack-katharine/inc/child-typography.php b/newspack-katharine/inc/child-typography.php
@@ -31,7 +31,7 @@ function newspack_katharine_custom_typography_css() {
 	if ( true === get_theme_mod( 'accent_allcaps', true ) ) {
 		$css_blocks        .= '
 			.accent-header,
-			.site-content .wpnbha .article-section-title,
+			div.wpnbha .article-section-title,
 			.archive .page-title,
 			.author-bio h2 span,
 			.entry-meta .byline a,

diff --git a/newspack-katharine/sass/style.scss b/newspack-katharine/sass/style.scss
@@ -66,14 +66,14 @@ Nicolas Gallagher and Jonathan Neal https://necolas.github.io/normalize.css/
 
 .accent-header,
 .wp-block-columns .wp-block-column > .accent-header,
-.entry-content .wpnbha .article-section-title,
+div.wpnbha .article-section-title,
 .cat-links,
 .archive .page-title {
 	margin: 0 0 #{1.5 * $size__spacing-unit};
 }
 
 .accent-header,
-.site-content .wpnbha .article-section-title,
+div.wpnbha .article-section-title,
 .cat-links {
 	font-size: $font__size-xs;
 }
@@ -334,21 +334,19 @@ figcaption,
 	}
 }
 
-.entry .entry-content {
-	.wp-block-embed figcaption,
-	.wp-block-image figcaption,
-	.wp-block-audio figcaption,
-	.wp-block-video figcaption,
-	.wp-caption-text {
-		padding-left: 0;
-		padding-right: 0;
-		text-align: left;
-	}
+.wp-block-embed figcaption,
+.wp-block-image figcaption,
+.wp-block-audio figcaption,
+.wp-block-video figcaption,
+.wp-caption-text {
+	padding-left: 0;
+	padding-right: 0;
+	text-align: left;
+}
 
-	.wp-block-separator,
-	hr {
-		border-top: 1px dotted $color__text-main;
-	}
+.wp-block-separator,
+hr {
+	border-top: 1px dotted $color__text-main;
 }
 
 // Archives

diff --git a/newspack-nelson/inc/child-typography.php b/newspack-nelson/inc/child-typography.php
@@ -37,7 +37,7 @@ function newspack_nelson_custom_typography_css() {
 			.mobile-menu-toggle,
 			.accent-header,
 			.cat-links,
-			.site-content .wpnbha .article-section-title,
+			div.wpnbha .article-section-title,
 			.entry-meta .byline .author,
 			.tags-links a,
 			.post-edit-link,

diff --git a/newspack-nelson/sass/style.scss b/newspack-nelson/sass/style.scss
@@ -219,17 +219,16 @@ h4,
 // Accent headers
 
 .accent-header,
-.site-content .wpnbha .article-section-title,
+div.wpnbha .article-section-title,
 .cat-links {
 	color: $color__text-light;
-	font-family: $font__heading;
 	font-size: $font__size-xs;
 	font-weight: bold;
 }
 
 .accent-header,
 .wp-block-columns .wp-block-column > .accent-header,
-.entry-content .wpnbha .article-section-title {
+div.wpnbha .article-section-title {
 	margin-bottom: $size__spacing-unit;
 	@include media( tablet ) {
 		margin-bottom: #{1.5 * $size__spacing-unit};
@@ -407,17 +406,15 @@ blockquote {
 	}
 }
 
-.entry .entry-content {
-	.wp-block-separator {
-		border-top: 2px solid $color__text-main;
+.wp-block-separator {
+	border-top: 2px solid $color__text-main;
 
-		&:not( .is-style-dots ):not( .is-style-wide ) {
-			border-top: 5px solid $color__text-main;
-		}
+	&:not( .is-style-dots ):not( .is-style-wide ) {
+		border-top: 5px solid $color__text-main;
+	}
 
-		&.is-style-dots::before {
-			color: $color__text-main;
-		}
+	&.is-style-dots::before {
+		color: $color__text-main;
 	}
 }
 

diff --git a/newspack-sacha/inc/child-color-patterns.php b/newspack-sacha/inc/child-color-patterns.php
@@ -33,8 +33,8 @@ function newspack_sacha_custom_colors_css() {
 	$theme_css = '
 		.archive .page-title,
 		.h-sb .featured-image-beside .cat-links,
-		.entry-meta .byline a, .entry-meta .byline a:visited,
-		.entry .entry-content .entry-meta .byline a, .entry .entry-content .entry-meta .byline a:visited,
+		.entry-meta .byline a,
+		.entry-meta .byline a:visited,
 		.entry .entry-meta a:hover,
 		.accent-header,
 		.article-section-title,

diff --git a/newspack-sacha/inc/child-typography.php b/newspack-sacha/inc/child-typography.php
@@ -19,7 +19,9 @@ function newspack_sacha_custom_typography_css() {
 			.site-description,
 			.has-drop-cap:not(:focus)::first-letter,
 			.taxonomy-description,
-			.entry .entry-content blockquote, .entry .entry-content blockquote cite, .wp-block-pullquote cite {
+			blockquote,
+			blockquote cite,
+			.wp-block-pullquote cite {
 				font-family: ' . wp_kses( $font_header, null ) . ';
 			}
 		';

diff --git a/newspack-sacha/sass/style.scss b/newspack-sacha/sass/style.scss
@@ -70,7 +70,7 @@ Nicolas Gallagher and Jonathan Neal https://necolas.github.io/normalize.css/
 }
 
 .accent-header,
-.site-content .wpnbha .article-section-title,
+div.wpnbha .article-section-title,
 .cat-links {
 	font-size: $font__size-xs;
 	margin-bottom: $size__spacing-unit;
@@ -194,10 +194,6 @@ cite {
 }
 
 .single {
-	.cat-links {
-		text-align: center;
-	}
-
 	.featured-image-behind {
 		.entry-subhead {
 			border: 0;
@@ -216,10 +212,8 @@ cite {
 	}
 
 	.entry-header {
-		.entry-title,
-		.newspack-post-subtitle {
-			text-align: center;
-		}
+		text-align: center;
+
 		.entry-title {
 			margin-bottom: #{1.5 * $size__spacing-unit};
 			margin-top: $size__spacing-unit;

diff --git a/newspack-scott/inc/child-color-patterns.php b/newspack-scott/inc/child-color-patterns.php
@@ -46,6 +46,10 @@ function newspack_scott_custom_colors_css() {
 			color: ' . esc_html( $primary_color ) . ';
 		}
 
+		.wp-block-pullquote {
+			border-color: ' . esc_html( $primary_color ) . ';
+		}
+
 		@media only screen and (min-width: 782px) {
 			/* Header default background */
 			.h-db .featured-image-beside .cat-links:before {

diff --git a/newspack-scott/sass/style.scss b/newspack-scott/sass/style.scss
@@ -49,7 +49,7 @@ Nicolas Gallagher and Jonathan Neal https://necolas.github.io/normalize.css/
 
 .accent-header,
 .wp-block-columns .wp-block-column > .accent-header,
-.entry .wpnbha .article-section-title {
+div.wpnbha .article-section-title {
 	margin-bottom: 1em;
 }
 
@@ -141,7 +141,7 @@ Nicolas Gallagher and Jonathan Neal https://necolas.github.io/normalize.css/
 //! Pullquote
 .wp-block-pullquote {
 	border-width: 0;
-	border-color: transparent;
+	border-color: $color__primary;
 	font-family: $font__heading;
 	font-weight: bold;
 	padding-top: #{4 * $size__spacing-unit};

diff --git a/newspack-theme/archive.php b/newspack-theme/archive.php
@@ -116,7 +116,7 @@
 				$post_count++;
 				the_post();
 
-				if ( 1 === $post_count ) {
+				if ( 1 === $post_count || true === get_theme_mod( 'archive_show_excerpt', false ) ) {
 					get_template_part( 'template-parts/content/content', 'excerpt' );
 				} else {
 					get_template_part( 'template-parts/content/content', 'archive' );