瀏覽代碼

Merge branch 'trunk' into seedlet-blocks/update/theme-json-to-latest-spec

Kjell Reigstad 4 年之前
父節點
當前提交
3393f968d6
共有 40 個文件被更改,包括 775 次插入112 次删除
  1. 2 2
      seedlet/assets/css/print.css
  2. 0 0
      seedlet/assets/css/print.css.map
  3. 20 4
      seedlet/assets/css/style-editor.css
  4. 0 1
      seedlet/assets/css/style-editor.css.map
  5. 0 1
      seedlet/assets/sass/blocks/_editor.scss
  6. 0 1
      seedlet/assets/sass/blocks/_style.scss
  7. 0 0
      seedlet/assets/sass/blocks/subscription/editor.scss
  8. 0 6
      seedlet/assets/sass/blocks/subscription/style.scss
  9. 20 4
      seedlet/assets/sass/components/entry/_author-bio.scss
  10. 1 1
      seedlet/assets/sass/components/pagination/_style.scss
  11. 2 2
      seedlet/assets/sass/print.scss
  12. 2 2
      seedlet/assets/sass/structure/_vertical-margins.scss
  13. 20 0
      seedlet/functions.php
  14. 25 0
      seedlet/inc/jetpack.php
  15. 25 14
      seedlet/style-rtl.css
  16. 25 14
      seedlet/style.css
  17. 0 1
      seedlet/style.css.map
  18. 1 3
      seedlet/template-parts/content/content-single.php
  19. 21 20
      seedlet/template-parts/post/author-bio.php
  20. 22 0
      spearhead/assets/sass/_author-bio.scss
  21. 1 0
      spearhead/assets/sass/_block-extends.scss
  22. 1 1
      spearhead/assets/sass/_header.scss
  23. 14 7
      spearhead/assets/sass/_posts-and-pages.scss
  24. 42 0
      spearhead/assets/sass/block-extends/_blog-posts.scss
  25. 1 1
      spearhead/assets/sass/block-extends/_latest-posts.scss
  26. 13 0
      spearhead/assets/sass/navigation.scss
  27. 2 1
      spearhead/assets/sass/style.scss
  28. 70 0
      spearhead/inc/headstart/en.json
  29. 1 1
      spearhead/inc/wpcom-colors.php
  30. 138 0
      spearhead/languages/spearhead.pot
  31. 二進制
      spearhead/languages/sv.mo
  32. 109 0
      spearhead/languages/sv.po
  33. 11 0
      spearhead/navigation-rtl.css
  34. 11 0
      spearhead/navigation.css
  35. 0 0
      spearhead/navigation.css.map
  36. 二進制
      spearhead/screenshot.png
  37. 82 8
      spearhead/style-rtl.css
  38. 82 8
      spearhead/style.css
  39. 2 0
      spearhead/style.css.map
  40. 9 9
      spearhead/variables.css

+ 2 - 2
seedlet/assets/css/print.css

@@ -41,7 +41,7 @@ Andreas Hecht in https://www.jotform.com/blog/css-perfect-print-stylesheet-98272
 	.has-regular-font-size,
 	.has-large-font-size,
 	h2.author-title,
-	p.author-bio,
+	p.entry-author,
 	.comments-title, h3 {
 		font-size: 14pt;
 		margin-top: 25px;
@@ -101,7 +101,7 @@ Andreas Hecht in https://www.jotform.com/blog/css-perfect-print-stylesheet-98272
 	.site-branding-container:before,
 	.entry .entry-title:before,
 	.entry-footer,
-	.author-description:before,
+	.author-bio:before,
 	.post-navigation,
 	.widget-area,
 	.comment-form-flex,

File diff suppressed because it is too large
+ 0 - 0
seedlet/assets/css/print.css.map


+ 20 - 4
seedlet/assets/css/style-editor.css

@@ -1756,24 +1756,40 @@ pre.wp-block-verse {
  * Author
  */
 /* Author description */
-.author-bio {
+.entry-author {
 	font-size: var(--global--font-size-xs);
 	max-width: var(--responsive--aligndefault-width);
 }
 
-.site-main > article > .author-bio {
+.entry-author .author-avatar {
+	display: none;
+}
+
+.site-main > article > .entry-author {
 	margin-top: calc(2 * var(--global--spacing-vertical));
 }
 
-.author-bio .author-title {
+.entry-author .author-title {
+	font-family: var(--global--font-ui);
+	font-size: var(--global--font-size-xs);
+}
+
+.entry-author .author-title .author-name {
+	display: block;
+	margin-top: 4px;
 	font-family: var(--entry-author-bio--font-family);
 	font-size: var(--entry-author-bio--font-size);
 }
 
-.author-bio .author-description {
+.entry-author .author-bio {
 	font-size: var(--global--font-size-md);
 }
 
+.entry-author .author-link::before {
+	content: '';
+	display: block;
+}
+
 /**
  * Jetpack editor styles
  */

File diff suppressed because it is too large
+ 0 - 1
seedlet/assets/css/style-editor.css.map


+ 0 - 1
seedlet/assets/sass/blocks/_editor.scss

@@ -26,7 +26,6 @@
 @import "search/style";
 @import "separator/editor";
 @import "slideshow/editor";
-@import "subscription/editor";
 @import "table/editor";
 @import "verse/style";
 @import "utilities/editor"; // Import LAST to cascade properly

+ 0 - 1
seedlet/assets/sass/blocks/_style.scss

@@ -29,7 +29,6 @@
 @import "separator/style";
 @import "slideshow/style";
 @import "spacer/style";
-@import "subscription/style";
 @import "table/style";
 @import "verse/style";
 @import "video/style";

+ 0 - 0
seedlet/assets/sass/blocks/subscription/editor.scss


+ 0 - 6
seedlet/assets/sass/blocks/subscription/style.scss

@@ -1,6 +0,0 @@
-.jetpack_subscription_widget {
-  input[type="text"] {
-    padding: var(--global--spacing-horizontal) !important;
-    width: 100% !important;
-  }
-}

+ 20 - 4
seedlet/assets/sass/components/entry/_author-bio.scss

@@ -4,21 +4,37 @@
 
 /* Author description */
 
-.author-bio {
+.entry-author {
 
 	font-size: var(--global--font-size-xs);
 	max-width: var(--responsive--aligndefault-width);
 
+	.author-avatar {
+		display: none;
+	}
+
 	.site-main > article > & {
 		margin-top: calc(2 * var(--global--spacing-vertical));
 	}
 
 	.author-title {
-		font-family: var(--entry-author-bio--font-family);
-		font-size: var(--entry-author-bio--font-size);
+		font-family: var(--global--font-ui);
+		font-size: var(--global--font-size-xs);
+
+		.author-name {
+			display: block;
+			margin-top: 4px;
+			font-family: var(--entry-author-bio--font-family);
+			font-size: var(--entry-author-bio--font-size);
+		}
 	}
 
-	.author-description {
+	.author-bio {
 		font-size: var(--global--font-size-md);
 	}
+
+	.author-link::before {
+		content: '';
+		display: block;
+	}
 }

+ 1 - 1
seedlet/assets/sass/components/pagination/_style.scss

@@ -27,7 +27,7 @@
 	.nav-links {
 		@include media(mobile) {
 			display: flex;
-			justify-content: center;
+			justify-content: space-between;
 
 			.nav-next,
 			.nav-previous {

+ 2 - 2
seedlet/assets/sass/print.scss

@@ -51,7 +51,7 @@ Andreas Hecht in https://www.jotform.com/blog/css-perfect-print-stylesheet-98272
   .has-regular-font-size,
   .has-large-font-size,
   h2.author-title,
-  p.author-bio,
+  p.entry-author,
   .comments-title, h3 {
     font-size: 14pt;
     margin-top: 25px;
@@ -126,7 +126,7 @@ Andreas Hecht in https://www.jotform.com/blog/css-perfect-print-stylesheet-98272
   .site-branding-container:before,
   .entry .entry-title:before,
   .entry-footer,
-  .author-description:before,
+  .author-bio:before,
   .post-navigation,
   .widget-area,
   .comment-form-flex,

+ 2 - 2
seedlet/assets/sass/structure/_vertical-margins.scss

@@ -84,7 +84,7 @@
 .post-thumbnail,
 .entry-content,
 .entry-footer,
-.author-bio,
+.entry-author,
 .widget-area {
 	margin-top: var(--global--spacing-vertical);
 	margin-right: auto;
@@ -131,7 +131,7 @@
 .post-thumbnail > *,
 .page-content > *,
 .comment-content > *,
-.author-bio > *,
+.entry-author > *,
 .widget > * {
 	margin-top: var(--global--spacing-unit);
 	margin-bottom: var(--global--spacing-unit);

+ 20 - 0
seedlet/functions.php

@@ -422,6 +422,21 @@ function seedlet_skip_link_focus_fix() {
 }
 add_action( 'wp_print_footer_scripts', 'seedlet_skip_link_focus_fix' );
 
+if ( ! function_exists( 'seedlet_author_bio' ) ) {
+	/**
+	 * Implements the Jetpack Author bio
+	 */
+	function seedlet_author_bio() {
+		if ( ! function_exists( 'jetpack_author_bio' ) ) {
+			if ( ! is_singular( 'attachment' ) ) {
+				get_template_part( 'template-parts/post/author-bio' );
+			}
+		} else {
+			jetpack_author_bio();
+		}
+	}
+}
+
 /**
  * SVG Icons class.
  */
@@ -470,3 +485,8 @@ require get_template_directory() . '/inc/block-styles.php';
 if ( class_exists( 'WooCommerce' ) ) {
 	require get_template_directory() . '/inc/woocommerce.php';
 }
+
+/**
+ * Load Jetpack compatibility file.
+ */
+require get_template_directory() . '/inc/jetpack.php';

+ 25 - 0
seedlet/inc/jetpack.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Jetpack Compatibility File
+ *
+ * @link https://jetpack.com/
+ *
+ * @package Seedlet
+ */
+
+/**
+ * Jetpack setup function.
+ *
+ * See: https://jetpack.com/support/infinite-scroll/
+ * See: https://jetpack.com/support/responsive-videos/
+ */
+function seedlet_jetpack_setup() {
+	// Add theme support for Responsive Videos.
+	add_theme_support( 'jetpack-responsive-videos' );
+
+	// Add theme support for Content Options.
+	add_theme_support( 'jetpack-content-options', array(
+		'author-bio' => true,
+	) );
+}
+add_action( 'after_setup_theme', 'seedlet_jetpack_setup' );

+ 25 - 14
seedlet/style-rtl.css

@@ -441,7 +441,7 @@ Included in theme screenshot and in block patterns.
 .post-thumbnail,
 .entry-content,
 .entry-footer,
-.author-bio,
+.entry-author,
 .widget-area {
 	margin-top: var(--global--spacing-vertical);
 	margin-left: auto;
@@ -510,7 +510,7 @@ Included in theme screenshot and in block patterns.
 .post-thumbnail > *,
 .page-content > *,
 .comment-content > *,
-.author-bio > *,
+.entry-author > *,
 .widget > * {
 	margin-top: var(--global--spacing-unit);
 	margin-bottom: var(--global--spacing-unit);
@@ -521,7 +521,7 @@ Included in theme screenshot and in block patterns.
 .post-thumbnail > *:first-child,
 .page-content > *:first-child,
 .comment-content > *:first-child,
-.author-bio > *:first-child,
+.entry-author > *:first-child,
 .widget > *:first-child {
 	margin-top: 0;
 }
@@ -531,7 +531,7 @@ Included in theme screenshot and in block patterns.
 .post-thumbnail > *:last-child,
 .page-content > *:last-child,
 .comment-content > *:last-child,
-.author-bio > *:last-child,
+.entry-author > *:last-child,
 .widget > *:last-child {
 	margin-bottom: 0;
 }
@@ -2429,11 +2429,6 @@ hr.wp-block-separator.is-style-dots:before {
 	}
 }
 
-.jetpack_subscription_widget input[type="text"] {
-	padding: var(--global--spacing-horizontal) !important;
-	width: 100% !important;
-}
-
 table,
 .wp-block-table {
 	width: 100%;
@@ -3290,24 +3285,40 @@ nav a {
  * Author
  */
 /* Author description */
-.author-bio {
+.entry-author {
 	font-size: var(--global--font-size-xs);
 	max-width: var(--responsive--aligndefault-width);
 }
 
-.site-main > article > .author-bio {
+.entry-author .author-avatar {
+	display: none;
+}
+
+.site-main > article > .entry-author {
 	margin-top: calc(2 * var(--global--spacing-vertical));
 }
 
-.author-bio .author-title {
+.entry-author .author-title {
+	font-family: var(--global--font-ui);
+	font-size: var(--global--font-size-xs);
+}
+
+.entry-author .author-title .author-name {
+	display: block;
+	margin-top: 4px;
 	font-family: var(--entry-author-bio--font-family);
 	font-size: var(--entry-author-bio--font-size);
 }
 
-.author-bio .author-description {
+.entry-author .author-bio {
 	font-size: var(--global--font-size-md);
 }
 
+.entry-author .author-link::before {
+	content: '';
+	display: block;
+}
+
 /* Next/Previous navigation */
 .navigation {
 	color: var(--global--color-foreground);
@@ -3333,7 +3344,7 @@ nav a {
 @media only screen and (min-width: 482px) {
 	.navigation .nav-links {
 		display: flex;
-		justify-content: center;
+		justify-content: space-between;
 	}
 	.navigation .nav-links .nav-next,
 	.navigation .nav-links .nav-previous {

+ 25 - 14
seedlet/style.css

@@ -441,7 +441,7 @@ Included in theme screenshot and in block patterns.
 .post-thumbnail,
 .entry-content,
 .entry-footer,
-.author-bio,
+.entry-author,
 .widget-area {
 	margin-top: var(--global--spacing-vertical);
 	margin-right: auto;
@@ -510,7 +510,7 @@ Included in theme screenshot and in block patterns.
 .post-thumbnail > *,
 .page-content > *,
 .comment-content > *,
-.author-bio > *,
+.entry-author > *,
 .widget > * {
 	margin-top: var(--global--spacing-unit);
 	margin-bottom: var(--global--spacing-unit);
@@ -521,7 +521,7 @@ Included in theme screenshot and in block patterns.
 .post-thumbnail > *:first-child,
 .page-content > *:first-child,
 .comment-content > *:first-child,
-.author-bio > *:first-child,
+.entry-author > *:first-child,
 .widget > *:first-child {
 	margin-top: 0;
 }
@@ -531,7 +531,7 @@ Included in theme screenshot and in block patterns.
 .post-thumbnail > *:last-child,
 .page-content > *:last-child,
 .comment-content > *:last-child,
-.author-bio > *:last-child,
+.entry-author > *:last-child,
 .widget > *:last-child {
 	margin-bottom: 0;
 }
@@ -2429,11 +2429,6 @@ hr.wp-block-separator.is-style-dots:before {
 	}
 }
 
-.jetpack_subscription_widget input[type="text"] {
-	padding: var(--global--spacing-horizontal) !important;
-	width: 100% !important;
-}
-
 table,
 .wp-block-table {
 	width: 100%;
@@ -3311,24 +3306,40 @@ nav a {
  * Author
  */
 /* Author description */
-.author-bio {
+.entry-author {
 	font-size: var(--global--font-size-xs);
 	max-width: var(--responsive--aligndefault-width);
 }
 
-.site-main > article > .author-bio {
+.entry-author .author-avatar {
+	display: none;
+}
+
+.site-main > article > .entry-author {
 	margin-top: calc(2 * var(--global--spacing-vertical));
 }
 
-.author-bio .author-title {
+.entry-author .author-title {
+	font-family: var(--global--font-ui);
+	font-size: var(--global--font-size-xs);
+}
+
+.entry-author .author-title .author-name {
+	display: block;
+	margin-top: 4px;
 	font-family: var(--entry-author-bio--font-family);
 	font-size: var(--entry-author-bio--font-size);
 }
 
-.author-bio .author-description {
+.entry-author .author-bio {
 	font-size: var(--global--font-size-md);
 }
 
+.entry-author .author-link::before {
+	content: '';
+	display: block;
+}
+
 /* Next/Previous navigation */
 .navigation {
 	color: var(--global--color-foreground);
@@ -3354,7 +3365,7 @@ nav a {
 @media only screen and (min-width: 482px) {
 	.navigation .nav-links {
 		display: flex;
-		justify-content: center;
+		justify-content: space-between;
 	}
 	.navigation .nav-links .nav-next,
 	.navigation .nav-links .nav-previous {

File diff suppressed because it is too large
+ 0 - 1
seedlet/style.css.map


+ 1 - 3
seedlet/template-parts/content/content-single.php

@@ -53,8 +53,6 @@
 		<?php seedlet_entry_meta_footer(); ?>
 	</footer><!-- .entry-footer -->
 
-	<?php if ( ! is_singular( 'attachment' ) ) : ?>
-		<?php get_template_part( 'template-parts/post/author-bio' ); ?>
-	<?php endif; ?>
+	<?php seedlet_author_bio(); ?>
 
 </article><!-- #post-${ID} -->

+ 21 - 20
seedlet/template-parts/post/author-bio.php

@@ -3,29 +3,30 @@
  * The template for displaying Author info
  *
  * @package Seedlet
- * @since 1.0.0
  */
 
 if ( (bool) get_the_author_meta( 'description' ) ) : ?>
-<div class="author-bio">
-	<?php
-	_e( 'Published by', 'seedlet' );
-	?>
-	<h2 class="author-title">
-		<span class="author-heading">
-			<?php
-			printf(
-				/* post author */
-				esc_html( get_the_author() )
-			);
-			?>
-		</span>
-	</h2>
-	<p class="author-description">
-		<?php the_author_meta( 'description' ); ?></br>
+<div class="entry-author">
+
+	<div class="author-heading">
+		<h2 class="author-title">
+			<?php esc_html_e( 'Published by', 'seedlet' ); ?>
+			<span class="author-name">
+				<?php
+				printf(
+					/* post author */
+					esc_html( get_the_author() )
+				);
+				?>
+			</span><!-- .author-name -->
+		</h2>
+	</div><!-- .author-heading -->
+
+	<p class="author-bio">
+		<?php the_author_meta( 'description' ); ?>
 		<a class="author-link" href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>" rel="author">
-			<?php _e( 'View more posts', 'seedlet' ); ?>
+			<?php printf( esc_html__( 'View all posts by %s', 'seedlet' ), get_the_author() ); ?>
 		</a>
-	</p><!-- .author-description -->
-</div><!-- .author-bio -->
+	</p><!-- .author-bio -->
+</div><!-- .entry-author -->
 <?php endif; ?>

+ 22 - 0
spearhead/assets/sass/_author-bio.scss

@@ -0,0 +1,22 @@
+.author-link {
+	font-size: var(--global--font-size-xs);
+	position: relative;
+
+	&:after {
+		background-image: url("data:image/svg+xml,%3Csvg class='svg-icon' width='24' height='24' aria-hidden='true' role='img' focusable='false' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M6.96954 10.2804L11.9999 15.3107L17.0302 10.2804L15.9695 9.21973L11.9999 13.1894L8.0302 9.21973L6.96954 10.2804Z' fill='%23DB0042'%3E%3C/path%3E%3C/svg%3E");
+		background-repeat: no-repeat;
+		background-position: center center;
+		background-size: 14px 14px;
+		content: '';
+		position: absolute;
+		bottom: 0;
+		right: -14px;
+		width: 14px;
+		height: 14px;
+		transform: rotate(-90deg);
+
+		@media ( prefers-color-scheme: dark ) {
+			background-image: url("data:image/svg+xml,%3Csvg class='svg-icon' width='24' height='24' aria-hidden='true' role='img' focusable='false' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M6.96954 10.2804L11.9999 15.3107L17.0302 10.2804L15.9695 9.21973L11.9999 13.1894L8.0302 9.21973L6.96954 10.2804Z' fill='%23ff6a81'%3E%3C/path%3E%3C/svg%3E");
+		}
+	}
+}

+ 1 - 0
spearhead/assets/sass/_block-extends.scss

@@ -4,4 +4,5 @@
 @import "block-extends/links";
 @import "block-extends/navigation";
 @import "block-extends/related-posts";
+@import "block-extends/blog-posts";
 @import "block-extends/search";

+ 1 - 1
spearhead/assets/sass/_header.scss

@@ -62,7 +62,7 @@ $site-branding-height: 68px;
 				}
 
 				a {
-					color: var(--global--color-background);
+					color: var(--primary-nav--dropdown-color-link);
 				}
 			}
 		}

+ 14 - 7
spearhead/assets/sass/_posts-and-pages.scss

@@ -19,7 +19,7 @@
 				display: none;
 			}
 			a {
-				color: var(--global--color-foreground-light);
+				color: var(--global--color-foreground-low-contrast);
 				font-family: var(--global--font-primary);
 				font-size: var(--global--font-size-md);
 			}
@@ -38,7 +38,7 @@
 	article > * {
 		margin-top: calc( 0.48 * var(--global--spacing-vertical) );
 		margin-bottom: calc( 0.48 * var(--global--spacing-vertical) );
- 
+
 		/* This overrides Seedlet's style for this breakpoint */
 	 	@include media(mobile) {
 			margin-top: calc( 0.48 * var(--global--spacing-vertical) );
@@ -59,17 +59,24 @@
 
 .post.sticky { // .post class needed to make this stronger
 	background: var(--sticky-posts--color-background);
+	padding-bottom: calc(2 * var(--global--spacing-vertical));
 
 	.entry-title {
 		font-size: var(--sticky-posts--entry-title-font-size);
 	}
 
 	.entry-content {
-		color: var(--sticky-posts--color-text);
 		font-size: var(--sticky-posts--entry-content-font-size);
-		> * {
-			color: var(--global--color-foreground-light);
-		}
+	}
+
+	// Subsequent sticky posts do not need extra top padding.
+	+ .post.sticky {
+		padding-top: 0;
+	}
+
+	// The first non-sticky post does need extra top padding.
+	+ article:not(.post.sticky) {
+		padding-top: calc(2 * var(--global--spacing-vertical));
 	}
 }
 
@@ -110,5 +117,5 @@
 }
 
 .single {
-	color: var(--global--color-foreground-light);
+	color: var(--global--color-foreground);
 }

+ 42 - 0
spearhead/assets/sass/block-extends/_blog-posts.scss

@@ -0,0 +1,42 @@
+.wp-block-newspack-blocks-homepage-articles,
+.wp-block-a8c-blog-posts {
+
+	&.wpnbha article {
+		margin: 0 auto;
+		padding: var(--global--spacing-vertical) 0;
+	}
+
+	article {
+
+		.entry-wrapper {
+			margin: 0;
+			
+			p {
+				margin-top: 0;
+				margin-bottom: 0;
+			}
+		}
+
+		.entry-title {
+			margin-bottom: calc( 0.48 * var(--global--spacing-vertical));
+			a {
+				font-size: var(--global--font-size-lg);
+				color: var(--entry-header--color-link);
+				font-weight: var(--heading--font-weight);
+
+				&:hover,
+				&:focus {
+					color: var(--entry-header--color-hover);
+				}
+
+				&:active {
+					color: var(--entry-header--color-link);
+				}
+			}
+		}
+
+		.more-link {
+			margin-top: 0;
+		}
+	}
+}

+ 1 - 1
spearhead/assets/sass/block-extends/_latest-posts.scss

@@ -6,7 +6,7 @@
 		}
 
 		> a {
-			color: var(--global--color-foreground-light);
+			color: var(--global--color-foreground-low-contrast);
 			font-size: var(--global--font-size-lg);
 			font-weight: 500;
 

+ 13 - 0
spearhead/assets/sass/navigation.scss

@@ -8,3 +8,16 @@ $navigation-min-break-point: 'laptop';
 $navigation-max-break-point: 'laptop-only';
 
 @import "../../../seedlet/assets/sass/components/navigation/style";
+
+.primary-navigation,
+.woo-navigation {
+	.sub-menu {
+		@include media( $navigation-min-break-point ) {
+			padding: calc(0.5 * var(--primary-nav--padding)) calc( 2 * var(--primary-nav--padding) );
+
+			> .menu-item.menu-item-has-children {
+				padding: calc(0.5 * var(--primary-nav--padding)) calc( 2 * var(--primary-nav--padding) ) 0 0;
+			}
+		}
+	}
+}

+ 2 - 1
spearhead/assets/sass/style.scss

@@ -1,6 +1,6 @@
 /*
 Theme Name: Spearhead
-Theme URI: https://github.com/Automattic/themes/root-child
+Theme URI: https://wordpress.com/theme/spearhead
 Author: Automattic
 Author URI: https://automattic.com/
 Description: Share your podcast with the world using Spearhead.
@@ -14,6 +14,7 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 */
 
 @import "../../../seedlet/assets/sass/abstracts/mixins";
+@import "author-bio";
 @import "breakpoints";
 @import "responsive";
 @import "posts-and-pages";

File diff suppressed because it is too large
+ 70 - 0
spearhead/inc/headstart/en.json


+ 1 - 1
spearhead/inc/wpcom-colors.php

@@ -4,7 +4,7 @@ require_once get_template_directory() . '/inc/wpcom-colors-utils.php';
 
 seedlet_define_color_annotations( [
 	'background' => '#FFFFFF',
-	'foreground' => '#333333',
+	'foreground' => '#000000',
 	'primary' => '#DB0042',
 	'secondary' => '#555555',
 	'tertiary' => '#FAFBF6',

+ 138 - 0
spearhead/languages/spearhead.pot

@@ -0,0 +1,138 @@
+# Copyright (C) 2020 Automattic
+# This file is distributed under the GNU General Public License v2 or later.
+msgid ""
+msgstr ""
+"Project-Id-Version: Spearhead 1.2.1\n"
+"Report-Msgid-Bugs-To: http://wordpress.org/support/theme/spearhead\n"
+"POT-Creation-Date: 2020-10-21 18:05:54+00:00\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2020-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+
+#: functions.php:40
+msgid "Tiny"
+msgstr ""
+
+#: functions.php:41
+msgid "XS"
+msgstr ""
+
+#: functions.php:46
+msgid "Small"
+msgstr ""
+
+#: functions.php:47
+msgid "S"
+msgstr ""
+
+#: functions.php:52
+msgid "Medium"
+msgstr ""
+
+#: functions.php:53
+msgid "M"
+msgstr ""
+
+#: functions.php:58
+msgid "Large"
+msgstr ""
+
+#: functions.php:59
+msgid "L"
+msgstr ""
+
+#: functions.php:64 functions.php:65
+msgid "XL"
+msgstr ""
+
+#: functions.php:70
+msgid "Huge"
+msgstr ""
+
+#: functions.php:71
+msgid "XXL"
+msgstr ""
+
+#: functions.php:83
+msgid "Primary"
+msgstr ""
+
+#: functions.php:88
+msgid "Foreground"
+msgstr ""
+
+#: functions.php:93
+msgid "Background"
+msgstr ""
+
+#. translators: %s: Name of current post.
+#: functions.php:215
+msgid "More"
+msgstr ""
+
+#. translators: %s: Name of current post. Only visible to screen readers.
+#: functions.php:274
+msgid "Edit <span class=\"screen-reader-text\">%s</span>"
+msgstr ""
+
+#. #-#-#-#-#  spearhead.pot (Spearhead 1.2.1)  #-#-#-#-#
+#. Theme Name of the plugin/theme
+#: inc/block-patterns.php:21 wp-content/themes/pub/spearhead/style.css
+msgid "Spearhead"
+msgstr ""
+
+#: inc/block-patterns.php:33
+msgid "Related Posts"
+msgstr ""
+
+#: inc/block-patterns.php:42
+msgid "Archive page"
+msgstr ""
+
+#: inc/block-patterns.php:46
+msgid "Latest Posts"
+msgstr ""
+
+#: inc/block-patterns.php:49
+msgid "Categories"
+msgstr ""
+
+#: inc/block-patterns.php:57
+msgid "Podcast links"
+msgstr ""
+
+#: inc/block-patterns.php:61
+msgid "Podcast available on:"
+msgstr ""
+
+#: inc/block-patterns.php:77
+msgid "Podcast links list"
+msgstr ""
+
+#: search.php:31 template-parts/content/content-excerpt.php:17
+msgctxt "post"
+msgid "Featured"
+msgstr ""
+
+#. Theme URI of the plugin/theme
+#: wp-content/themes/pub/spearhead/style.css
+msgid "https://github.com/Automattic/themes/root-child"
+msgstr ""
+
+#. Description of the plugin/theme
+#: wp-content/themes/pub/spearhead/style.css
+msgid "Share your podcast with the world using Spearhead."
+msgstr ""
+
+#. Author of the plugin/theme
+#: wp-content/themes/pub/spearhead/style.css
+msgid "Automattic"
+msgstr ""
+
+#. Author URI of the plugin/theme
+#: wp-content/themes/pub/spearhead/style.css
+msgid "https://automattic.com/"
+msgstr ""

二進制
spearhead/languages/sv.mo


+ 109 - 0
spearhead/languages/sv.po

@@ -0,0 +1,109 @@
+# Translation of WordPress.com - Themes - Spearhead in Swedish
+# This file is distributed under the same license as the WordPress.com - Themes - Spearhead package.
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2020-10-23 08:45:16+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: GlotPress/2.4.0-alpha\n"
+"Language: sv_SE\n"
+"Project-Id-Version: WordPress.com - Themes - Spearhead\n"
+
+#: inc/block-patterns.php:49
+msgid "Categories"
+msgstr "Kategorier"
+
+#: search.php:31 template-parts/content/content-excerpt.php:17
+msgctxt "post"
+msgid "Featured"
+msgstr "Utvalt"
+
+#: inc/block-patterns.php:61
+msgid "Podcast available on:"
+msgstr "Podcast tillgänglig på:"
+
+#. translators: %s: Name of current post. Only visible to screen readers.
+#: functions.php:274
+msgid "Edit <span class=\"screen-reader-text\">%s</span>"
+msgstr "Redigera <span class=\"screen-reader-text\">%s</span>"
+
+#: inc/block-patterns.php:33
+msgid "Related Posts"
+msgstr "Relaterade inlägg"
+
+#: inc/block-patterns.php:42
+msgid "Archive page"
+msgstr "Arkivsida"
+
+#: inc/block-patterns.php:46
+msgid "Latest Posts"
+msgstr "Senaste inläggen"
+
+#. #-#-#-#-#  spearhead.pot (Spearhead 1.2.1)  #-#-#-#-#
+#. Theme Name of the plugin/theme
+#: inc/block-patterns.php:21 wp-content/themes/pub/spearhead/style.css
+msgid "Spearhead"
+msgstr "Spearhead"
+
+#: functions.php:88
+msgid "Foreground"
+msgstr "Förgrund"
+
+#: functions.php:93
+msgid "Background"
+msgstr "Bakgrund"
+
+#. translators: %s: Name of current post.
+#: functions.php:215
+msgid "More"
+msgstr "Mer"
+
+#: functions.php:59
+msgid "L"
+msgstr "L"
+
+#: functions.php:64 functions.php:65
+msgid "XL"
+msgstr "XL"
+
+#: functions.php:70
+msgid "Huge"
+msgstr "Enorm"
+
+#: functions.php:71
+msgid "XXL"
+msgstr "XXL"
+
+#: functions.php:83
+msgid "Primary"
+msgstr "Primär"
+
+#: functions.php:52
+msgid "Medium"
+msgstr "Medium"
+
+#: functions.php:53
+msgid "M"
+msgstr "M"
+
+#: functions.php:58
+msgid "Large"
+msgstr "Stor"
+
+#: functions.php:40
+msgid "Tiny"
+msgstr "Litet"
+
+#: functions.php:41
+msgid "XS"
+msgstr "XS"
+
+#: functions.php:46
+msgid "Small"
+msgstr "Liten"
+
+#: functions.php:47
+msgid "S"
+msgstr "S"

+ 11 - 0
spearhead/navigation-rtl.css

@@ -522,4 +522,15 @@
 		position: fixed;
 		left: 0;
 	}
+}
+
+@media only screen and (min-width: 830px) {
+	.primary-navigation .sub-menu,
+	.woo-navigation .sub-menu {
+		padding: calc(0.5 * var(--primary-nav--padding)) calc( 2 * var(--primary-nav--padding));
+	}
+	.primary-navigation .sub-menu > .menu-item.menu-item-has-children,
+	.woo-navigation .sub-menu > .menu-item.menu-item-has-children {
+		padding: calc(0.5 * var(--primary-nav--padding)) 0 0 calc( 2 * var(--primary-nav--padding));
+	}
 }

+ 11 - 0
spearhead/navigation.css

@@ -524,4 +524,15 @@
 	}
 }
 
+@media only screen and (min-width: 830px) {
+	.primary-navigation .sub-menu,
+	.woo-navigation .sub-menu {
+		padding: calc(0.5 * var(--primary-nav--padding)) calc( 2 * var(--primary-nav--padding));
+	}
+	.primary-navigation .sub-menu > .menu-item.menu-item-has-children,
+	.woo-navigation .sub-menu > .menu-item.menu-item-has-children {
+		padding: calc(0.5 * var(--primary-nav--padding)) calc( 2 * var(--primary-nav--padding)) 0 0;
+	}
+}
+
 /*# sourceMappingURL=navigation.css.map */

File diff suppressed because it is too large
+ 0 - 0
spearhead/navigation.css.map


二進制
spearhead/screenshot.png


+ 82 - 8
spearhead/style-rtl.css

@@ -1,6 +1,6 @@
 /*
 Theme Name: Spearhead
-Theme URI: https://github.com/Automattic/themes/root-child
+Theme URI: https://wordpress.com/theme/spearhead
 Author: Automattic
 Author URI: https://automattic.com/
 Description: Share your podcast with the world using Spearhead.
@@ -15,6 +15,31 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 /**
  * Required Variables
  */
+.author-link {
+	font-size: var(--global--font-size-xs);
+	position: relative;
+}
+
+.author-link:after {
+	background-image: url("data:image/svg+xml,%3Csvg class='svg-icon' width='24' height='24' aria-hidden='true' role='img' focusable='false' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M6.96954 10.2804L11.9999 15.3107L17.0302 10.2804L15.9695 9.21973L11.9999 13.1894L8.0302 9.21973L6.96954 10.2804Z' fill='%23DB0042'%3E%3C/path%3E%3C/svg%3E");
+	background-repeat: no-repeat;
+	background-position: center center;
+	background-size: 14px 14px;
+	content: '';
+	position: absolute;
+	bottom: 0;
+	left: -14px;
+	width: 14px;
+	height: 14px;
+	transform: rotate(90deg);
+}
+
+@media (prefers-color-scheme: dark) {
+	.author-link:after {
+		background-image: url("data:image/svg+xml,%3Csvg class='svg-icon' width='24' height='24' aria-hidden='true' role='img' focusable='false' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M6.96954 10.2804L11.9999 15.3107L17.0302 10.2804L15.9695 9.21973L11.9999 13.1894L8.0302 9.21973L6.96954 10.2804Z' fill='%23ff6a81'%3E%3C/path%3E%3C/svg%3E");
+	}
+}
+
 /**
  * Required Variables
  */
@@ -55,7 +80,7 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 }
 
 .post .entry-header .entry-meta .posted-on a {
-	color: var(--global--color-foreground-light);
+	color: var(--global--color-foreground-low-contrast);
 	font-family: var(--global--font-primary);
 	font-size: var(--global--font-size-md);
 }
@@ -93,6 +118,7 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 
 .post.sticky {
 	background: var(--sticky-posts--color-background);
+	padding-bottom: calc(2 * var(--global--spacing-vertical));
 }
 
 .post.sticky .entry-title {
@@ -100,12 +126,15 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 }
 
 .post.sticky .entry-content {
-	color: var(--sticky-posts--color-text);
 	font-size: var(--sticky-posts--entry-content-font-size);
 }
 
-.post.sticky .entry-content > * {
-	color: var(--global--color-foreground-light);
+.post.sticky + .post.sticky {
+	padding-top: 0;
+}
+
+.post.sticky + article:not(.post.sticky) {
+	padding-top: calc(2 * var(--global--spacing-vertical));
 }
 
 .sticky-post {
@@ -141,7 +170,7 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 }
 
 .single {
-	color: var(--global--color-foreground-light);
+	color: var(--global--color-foreground);
 }
 
 .has-link-color a, a {
@@ -222,7 +251,7 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 		top: 114px;
 	}
 	.site-header .primary-navigation .primary-menu-container a {
-		color: var(--global--color-background);
+		color: var(--primary-nav--dropdown-color-link);
 	}
 }
 
@@ -366,7 +395,7 @@ ul.wp-block-categories,
 }
 
 .wp-block-latest-posts > li > a {
-	color: var(--global--color-foreground-light);
+	color: var(--global--color-foreground-low-contrast);
 	font-size: var(--global--font-size-lg);
 	font-weight: 500;
 }
@@ -426,6 +455,51 @@ ul.wp-block-categories,
 	text-transform: uppercase;
 }
 
+.wp-block-newspack-blocks-homepage-articles.wpnbha article,
+.wp-block-a8c-blog-posts.wpnbha article {
+	margin: 0 auto;
+	padding: var(--global--spacing-vertical) 0;
+}
+
+.wp-block-newspack-blocks-homepage-articles article .entry-wrapper,
+.wp-block-a8c-blog-posts article .entry-wrapper {
+	margin: 0;
+}
+
+.wp-block-newspack-blocks-homepage-articles article .entry-wrapper p,
+.wp-block-a8c-blog-posts article .entry-wrapper p {
+	margin-top: 0;
+	margin-bottom: 0;
+}
+
+.wp-block-newspack-blocks-homepage-articles article .entry-title,
+.wp-block-a8c-blog-posts article .entry-title {
+	margin-bottom: calc( 0.48 * var(--global--spacing-vertical));
+}
+
+.wp-block-newspack-blocks-homepage-articles article .entry-title a,
+.wp-block-a8c-blog-posts article .entry-title a {
+	font-size: var(--global--font-size-lg);
+	color: var(--entry-header--color-link);
+	font-weight: var(--heading--font-weight);
+}
+
+.wp-block-newspack-blocks-homepage-articles article .entry-title a:hover, .wp-block-newspack-blocks-homepage-articles article .entry-title a:focus,
+.wp-block-a8c-blog-posts article .entry-title a:hover,
+.wp-block-a8c-blog-posts article .entry-title a:focus {
+	color: var(--entry-header--color-hover);
+}
+
+.wp-block-newspack-blocks-homepage-articles article .entry-title a:active,
+.wp-block-a8c-blog-posts article .entry-title a:active {
+	color: var(--entry-header--color-link);
+}
+
+.wp-block-newspack-blocks-homepage-articles article .more-link,
+.wp-block-a8c-blog-posts article .more-link {
+	margin-top: 0;
+}
+
 .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper {
 	padding: 0;
 }

+ 82 - 8
spearhead/style.css

@@ -1,6 +1,6 @@
 /*
 Theme Name: Spearhead
-Theme URI: https://github.com/Automattic/themes/root-child
+Theme URI: https://wordpress.com/theme/spearhead
 Author: Automattic
 Author URI: https://automattic.com/
 Description: Share your podcast with the world using Spearhead.
@@ -15,6 +15,31 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 /**
  * Required Variables
  */
+.author-link {
+	font-size: var(--global--font-size-xs);
+	position: relative;
+}
+
+.author-link:after {
+	background-image: url("data:image/svg+xml,%3Csvg class='svg-icon' width='24' height='24' aria-hidden='true' role='img' focusable='false' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M6.96954 10.2804L11.9999 15.3107L17.0302 10.2804L15.9695 9.21973L11.9999 13.1894L8.0302 9.21973L6.96954 10.2804Z' fill='%23DB0042'%3E%3C/path%3E%3C/svg%3E");
+	background-repeat: no-repeat;
+	background-position: center center;
+	background-size: 14px 14px;
+	content: '';
+	position: absolute;
+	bottom: 0;
+	right: -14px;
+	width: 14px;
+	height: 14px;
+	transform: rotate(-90deg);
+}
+
+@media (prefers-color-scheme: dark) {
+	.author-link:after {
+		background-image: url("data:image/svg+xml,%3Csvg class='svg-icon' width='24' height='24' aria-hidden='true' role='img' focusable='false' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M6.96954 10.2804L11.9999 15.3107L17.0302 10.2804L15.9695 9.21973L11.9999 13.1894L8.0302 9.21973L6.96954 10.2804Z' fill='%23ff6a81'%3E%3C/path%3E%3C/svg%3E");
+	}
+}
+
 /**
  * Required Variables
  */
@@ -55,7 +80,7 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 }
 
 .post .entry-header .entry-meta .posted-on a {
-	color: var(--global--color-foreground-light);
+	color: var(--global--color-foreground-low-contrast);
 	font-family: var(--global--font-primary);
 	font-size: var(--global--font-size-md);
 }
@@ -93,6 +118,7 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 
 .post.sticky {
 	background: var(--sticky-posts--color-background);
+	padding-bottom: calc(2 * var(--global--spacing-vertical));
 }
 
 .post.sticky .entry-title {
@@ -100,12 +126,15 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 }
 
 .post.sticky .entry-content {
-	color: var(--sticky-posts--color-text);
 	font-size: var(--sticky-posts--entry-content-font-size);
 }
 
-.post.sticky .entry-content > * {
-	color: var(--global--color-foreground-light);
+.post.sticky + .post.sticky {
+	padding-top: 0;
+}
+
+.post.sticky + article:not(.post.sticky) {
+	padding-top: calc(2 * var(--global--spacing-vertical));
 }
 
 .sticky-post {
@@ -141,7 +170,7 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 }
 
 .single {
-	color: var(--global--color-foreground-light);
+	color: var(--global--color-foreground);
 }
 
 .has-link-color a, a {
@@ -222,7 +251,7 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 		top: 114px;
 	}
 	.site-header .primary-navigation .primary-menu-container a {
-		color: var(--global--color-background);
+		color: var(--primary-nav--dropdown-color-link);
 	}
 }
 
@@ -366,7 +395,7 @@ ul.wp-block-categories,
 }
 
 .wp-block-latest-posts > li > a {
-	color: var(--global--color-foreground-light);
+	color: var(--global--color-foreground-low-contrast);
 	font-size: var(--global--font-size-lg);
 	font-weight: 500;
 }
@@ -426,6 +455,51 @@ ul.wp-block-categories,
 	text-transform: uppercase;
 }
 
+.wp-block-newspack-blocks-homepage-articles.wpnbha article,
+.wp-block-a8c-blog-posts.wpnbha article {
+	margin: 0 auto;
+	padding: var(--global--spacing-vertical) 0;
+}
+
+.wp-block-newspack-blocks-homepage-articles article .entry-wrapper,
+.wp-block-a8c-blog-posts article .entry-wrapper {
+	margin: 0;
+}
+
+.wp-block-newspack-blocks-homepage-articles article .entry-wrapper p,
+.wp-block-a8c-blog-posts article .entry-wrapper p {
+	margin-top: 0;
+	margin-bottom: 0;
+}
+
+.wp-block-newspack-blocks-homepage-articles article .entry-title,
+.wp-block-a8c-blog-posts article .entry-title {
+	margin-bottom: calc( 0.48 * var(--global--spacing-vertical));
+}
+
+.wp-block-newspack-blocks-homepage-articles article .entry-title a,
+.wp-block-a8c-blog-posts article .entry-title a {
+	font-size: var(--global--font-size-lg);
+	color: var(--entry-header--color-link);
+	font-weight: var(--heading--font-weight);
+}
+
+.wp-block-newspack-blocks-homepage-articles article .entry-title a:hover, .wp-block-newspack-blocks-homepage-articles article .entry-title a:focus,
+.wp-block-a8c-blog-posts article .entry-title a:hover,
+.wp-block-a8c-blog-posts article .entry-title a:focus {
+	color: var(--entry-header--color-hover);
+}
+
+.wp-block-newspack-blocks-homepage-articles article .entry-title a:active,
+.wp-block-a8c-blog-posts article .entry-title a:active {
+	color: var(--entry-header--color-link);
+}
+
+.wp-block-newspack-blocks-homepage-articles article .more-link,
+.wp-block-a8c-blog-posts article .more-link {
+	margin-top: 0;
+}
+
 .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper {
 	padding: 0;
 }

File diff suppressed because it is too large
+ 2 - 0
spearhead/style.css.map


+ 9 - 9
spearhead/variables.css

@@ -9,7 +9,7 @@
 	--global--color-secondary: #555555;
 	--global--color-secondary-hover: #333333;
 	--global--color-foreground: #000000;
-	--global--color-foreground-light: #333333;
+	--global--color-foreground-low-contrast: #333333;
 	--global--color-background: #fff;
 	--global--color-border: var(--global--color-secondary);
 	/* Font Weight */
@@ -50,7 +50,7 @@
 	--heading--line-height-h3: 1.4;
 
 	--entry-header--font-size: var(--heading--font-size-h1);
-	--entry-header--color: var(--global--color-foreground-light);
+	--entry-header--color: var(--global--color-foreground);
 
 	--button--border-radius: 0px;
 	--button--color-text: var(--global--color-background);
@@ -69,6 +69,7 @@
 
 	--primary-nav--justify-content: flex-end;
 	--primary-nav--color-link: var(--global--color-secondary);
+	--primary-nav--dropdown-color-link: var(--global--color-background);
 	--primary-nav--color-background: var(--global--color-foreground);
 	--primary-nav--padding: 6px;
 	--primary-nav--font-family-mobile: var(--global--font-family-secondary);
@@ -85,7 +86,6 @@
 	--list--font-family: var(--global--font-secondary);
 
 	/* Sticky Posts */
-	--sticky-posts--color-text: var(--global--color-foreground);
 	--sticky-posts--color-background: #F9F9F9;
 	--sticky-posts--entry-title-font-size: 24px;
 	--sticky-posts--entry-content-font-size: 20px;
@@ -105,15 +105,15 @@
 		--global--color-primary-hover: #ffffff;
 		--global--color-secondary: #b2b2b2;
 		--global--color-secondary-hover: #cccccc;
-		--global--color-foreground: #b2b2b2;
-		--global--color-foreground-light: #ffffff;
+		--global--color-foreground: #ffffff;
+		--global--color-foreground-low-contrast: #b2b2b2;
 		--global--color-background: #1e1f21;
 		--global--color-text-selection: #000000;
-		--primary-nav--color-background: var(--global--color-foreground-light);
-		--button--padding-vertical: 24px;
-		--button--padding-horizontal: 32px;
 		--sticky-posts--color-background: var(--global--color-background);
-		--sticky-posts--color-text: var(--global--color-foreground-light);
 		--sticky-posts--alt-color-background: #2d3139;
+		--primary-nav--color-background: var(--sticky-posts--alt-color-background);
+		--primary-nav--dropdown-color-link: var(--global--color-foreground);
+		--button--padding-vertical: 24px;
+		--button--padding-horizontal: 32px;
 	}
 }

Some files were not shown because too many files changed in this diff