浏览代码

Rivington: Blog Posts block style tweak and enqueue google fonts properly

Takashi Irie 5 年之前
父节点
当前提交
1e3fae53f2

+ 4 - 16
rivington/functions.php

@@ -128,27 +128,15 @@ function rivington_fonts_url() {
 	$fonts_url = '';
 
 	/* Translators: If there are characters in your language that are not
-	* supported by Playfair Display, translate this to 'off'. Do not translate
+	* supported by Poppins, translate this to 'off'. Do not translate
 	* into your own language.
 	*/
-	$playfair = esc_html_x( 'on', 'Playfair Display font: on or off', 'rivington' );
+	$poppins = esc_html_x( 'on', 'Poppins font: on or off', 'rivington' );
 
-	/* Translators: If there are characters in your language that are not
-	* supported by Roboto Sans, translate this to 'off'. Do not translate
-	* into your own language.
-	*/
-	$roboto = esc_html_x( 'on', 'Roboto Sans font: on or off', 'rivington' );
-
-	if ( 'off' !== $playfair || 'off' !== $roboto ) {
+	if ( 'off' !== $poppins ) {
 		$font_families = array();
 
-		if ( 'off' !== $playfair ) {
-			$font_families[] = 'Playfair+Display:400,400i';
-		}
-
-		if ( 'off' !== $roboto ) {
-			$font_families[] = 'Roboto:300,300i,700';
-		}
+		$font_families[] = 'Poppins:400,400i,600,600i';
 
 		$query_args = array(
 			'family' => urlencode( implode( '|', $font_families ) ),

+ 57 - 0
rivington/sass/_extra-child-theme.scss

@@ -288,6 +288,63 @@ a {
 	}
 }
 
+.wp-block-newspack-blocks-homepage-articles {
+	article {
+		.entry-title a{
+			&:active,
+			&:focus,
+			&:hover {
+				text-decoration: none;
+			}
+		}
+
+		.more-link {
+
+		}
+
+		.cat-links a,
+		.more-link,
+		.entry-meta a {
+			text-decoration: none;
+
+			&:active,
+			&:focus,
+			&:hover {
+				color: $color_primary_hover;
+				text-decoration: underline;
+			}
+		}
+	}
+
+	&.image-alignbehind article {
+		.entry-title a{
+			&:active,
+			&:focus,
+			&:hover {
+				text-decoration: underline;
+			}
+		}
+
+		.more-link {
+			&:active,
+			&:focus,
+			&:hover {
+				color: inherit;
+			}
+		}
+	}
+}
+
+.has-background:not(.has-background-background-color),
+[class*="background-color"]:not(.has-background-background-color),
+[style*="background-color"] {
+	.wp-block-newspack-blocks-homepage-articles article {
+		.entry-title a:hover {
+			text-decoration: underline;
+		}
+	}
+}
+
 /**
  * Widgets
  */

+ 53 - 0
rivington/sass/style-child-theme-editor.scss

@@ -77,3 +77,56 @@ $font_size_md: map-deep-get($config-global, "font", "size", "md");
 		}
 	}
 }
+
+.wp-block-a8c-blog-posts {
+	.entry-title a {
+		color: inherit;
+
+		&:active,
+		&:focus,
+		&:hover {
+			text-decoration: none;
+			color: #{map-deep-get($config-global, "color", "primary", "default")};
+		}
+	}
+
+	.cat-links a,
+	.more-link,
+	.entry-meta a {
+		text-decoration: none;
+
+		&:active,
+		&:focus,
+		&:hover {
+			text-decoration: underline;
+		}
+	}
+
+	&.image-alignbehind article {
+		.entry-title a {
+			&:active,
+			&:focus,
+			&:hover {
+				text-decoration: underline;
+			}
+		}
+	}
+}
+
+.has-background:not(.has-background-background-color),
+[class*="background-color"]:not(.has-background-background-color),
+[style*="background-color"] {
+	.wp-block-a8c-blog-posts {
+		.entry-title a{
+			&:active,
+			&:focus,
+			&:hover {
+				text-decoration: underline;
+			}
+		}
+	}
+}
+
+.wp-block-a8c-blog-posts + .button {
+	font-size: (strip-unit(map-deep-get($config-global, "font", "size", "base")) + 0em);
+}

+ 47 - 0
rivington/style-editor.css

@@ -311,6 +311,10 @@ object {
 	padding: 32px;
 }
 
+.wp-block-a8c-blog-posts.image-alignbehind .post-has-image .cat-links {
+	color: #fff;
+}
+
 .wp-block-a8c-blog-posts.image-alignbehind .post-has-image a:hover {
 	color: currentColor;
 }
@@ -1269,3 +1273,46 @@ table th,
 		font-size: 1.25em;
 	}
 }
+
+.wp-block-a8c-blog-posts .entry-title a {
+	color: inherit;
+}
+
+.wp-block-a8c-blog-posts .entry-title a:active, .wp-block-a8c-blog-posts .entry-title a:focus, .wp-block-a8c-blog-posts .entry-title a:hover {
+	text-decoration: none;
+	color: #CAAB57;
+}
+
+.wp-block-a8c-blog-posts .cat-links a,
+.wp-block-a8c-blog-posts .more-link,
+.wp-block-a8c-blog-posts .entry-meta a {
+	text-decoration: none;
+}
+
+.wp-block-a8c-blog-posts .cat-links a:active, .wp-block-a8c-blog-posts .cat-links a:focus, .wp-block-a8c-blog-posts .cat-links a:hover,
+.wp-block-a8c-blog-posts .more-link:active,
+.wp-block-a8c-blog-posts .more-link:focus,
+.wp-block-a8c-blog-posts .more-link:hover,
+.wp-block-a8c-blog-posts .entry-meta a:active,
+.wp-block-a8c-blog-posts .entry-meta a:focus,
+.wp-block-a8c-blog-posts .entry-meta a:hover {
+	text-decoration: underline;
+}
+
+.wp-block-a8c-blog-posts.image-alignbehind article .entry-title a:active, .wp-block-a8c-blog-posts.image-alignbehind article .entry-title a:focus, .wp-block-a8c-blog-posts.image-alignbehind article .entry-title a:hover {
+	text-decoration: underline;
+}
+
+.has-background:not(.has-background-background-color) .wp-block-a8c-blog-posts .entry-title a:active, .has-background:not(.has-background-background-color) .wp-block-a8c-blog-posts .entry-title a:focus, .has-background:not(.has-background-background-color) .wp-block-a8c-blog-posts .entry-title a:hover,
+[class*="background-color"]:not(.has-background-background-color) .wp-block-a8c-blog-posts .entry-title a:active,
+[class*="background-color"]:not(.has-background-background-color) .wp-block-a8c-blog-posts .entry-title a:focus,
+[class*="background-color"]:not(.has-background-background-color) .wp-block-a8c-blog-posts .entry-title a:hover,
+[style*="background-color"] .wp-block-a8c-blog-posts .entry-title a:active,
+[style*="background-color"] .wp-block-a8c-blog-posts .entry-title a:focus,
+[style*="background-color"] .wp-block-a8c-blog-posts .entry-title a:hover {
+	text-decoration: underline;
+}
+
+.wp-block-a8c-blog-posts + .button {
+	font-size: 1em;
+}

+ 35 - 0
rivington/style-rtl.css

@@ -4213,6 +4213,41 @@ p:not(.site-title) a:hover {
 	padding-right: 0;
 }
 
+.wp-block-newspack-blocks-homepage-articles article .entry-title a:active, .wp-block-newspack-blocks-homepage-articles article .entry-title a:focus, .wp-block-newspack-blocks-homepage-articles article .entry-title a:hover {
+	text-decoration: none;
+}
+
+.wp-block-newspack-blocks-homepage-articles article .cat-links a,
+.wp-block-newspack-blocks-homepage-articles article .more-link,
+.wp-block-newspack-blocks-homepage-articles article .entry-meta a {
+	text-decoration: none;
+}
+
+.wp-block-newspack-blocks-homepage-articles article .cat-links a:active, .wp-block-newspack-blocks-homepage-articles article .cat-links a:focus, .wp-block-newspack-blocks-homepage-articles article .cat-links a:hover,
+.wp-block-newspack-blocks-homepage-articles article .more-link:active,
+.wp-block-newspack-blocks-homepage-articles article .more-link:focus,
+.wp-block-newspack-blocks-homepage-articles article .more-link:hover,
+.wp-block-newspack-blocks-homepage-articles article .entry-meta a:active,
+.wp-block-newspack-blocks-homepage-articles article .entry-meta a:focus,
+.wp-block-newspack-blocks-homepage-articles article .entry-meta a:hover {
+	color: #b59439;
+	text-decoration: underline;
+}
+
+.wp-block-newspack-blocks-homepage-articles.image-alignbehind article .entry-title a:active, .wp-block-newspack-blocks-homepage-articles.image-alignbehind article .entry-title a:focus, .wp-block-newspack-blocks-homepage-articles.image-alignbehind article .entry-title a:hover {
+	text-decoration: underline;
+}
+
+.wp-block-newspack-blocks-homepage-articles.image-alignbehind article .more-link:active, .wp-block-newspack-blocks-homepage-articles.image-alignbehind article .more-link:focus, .wp-block-newspack-blocks-homepage-articles.image-alignbehind article .more-link:hover {
+	color: inherit;
+}
+
+.has-background:not(.has-background-background-color) .wp-block-newspack-blocks-homepage-articles article .entry-title a:hover,
+[class*="background-color"]:not(.has-background-background-color) .wp-block-newspack-blocks-homepage-articles article .entry-title a:hover,
+[style*="background-color"] .wp-block-newspack-blocks-homepage-articles article .entry-title a:hover {
+	text-decoration: underline;
+}
+
 /**
  * Widgets
  */

+ 35 - 0
rivington/style.css

@@ -4242,6 +4242,41 @@ p:not(.site-title) a:hover {
 	padding-left: 0;
 }
 
+.wp-block-newspack-blocks-homepage-articles article .entry-title a:active, .wp-block-newspack-blocks-homepage-articles article .entry-title a:focus, .wp-block-newspack-blocks-homepage-articles article .entry-title a:hover {
+	text-decoration: none;
+}
+
+.wp-block-newspack-blocks-homepage-articles article .cat-links a,
+.wp-block-newspack-blocks-homepage-articles article .more-link,
+.wp-block-newspack-blocks-homepage-articles article .entry-meta a {
+	text-decoration: none;
+}
+
+.wp-block-newspack-blocks-homepage-articles article .cat-links a:active, .wp-block-newspack-blocks-homepage-articles article .cat-links a:focus, .wp-block-newspack-blocks-homepage-articles article .cat-links a:hover,
+.wp-block-newspack-blocks-homepage-articles article .more-link:active,
+.wp-block-newspack-blocks-homepage-articles article .more-link:focus,
+.wp-block-newspack-blocks-homepage-articles article .more-link:hover,
+.wp-block-newspack-blocks-homepage-articles article .entry-meta a:active,
+.wp-block-newspack-blocks-homepage-articles article .entry-meta a:focus,
+.wp-block-newspack-blocks-homepage-articles article .entry-meta a:hover {
+	color: #b59439;
+	text-decoration: underline;
+}
+
+.wp-block-newspack-blocks-homepage-articles.image-alignbehind article .entry-title a:active, .wp-block-newspack-blocks-homepage-articles.image-alignbehind article .entry-title a:focus, .wp-block-newspack-blocks-homepage-articles.image-alignbehind article .entry-title a:hover {
+	text-decoration: underline;
+}
+
+.wp-block-newspack-blocks-homepage-articles.image-alignbehind article .more-link:active, .wp-block-newspack-blocks-homepage-articles.image-alignbehind article .more-link:focus, .wp-block-newspack-blocks-homepage-articles.image-alignbehind article .more-link:hover {
+	color: inherit;
+}
+
+.has-background:not(.has-background-background-color) .wp-block-newspack-blocks-homepage-articles article .entry-title a:hover,
+[class*="background-color"]:not(.has-background-background-color) .wp-block-newspack-blocks-homepage-articles article .entry-title a:hover,
+[style*="background-color"] .wp-block-newspack-blocks-homepage-articles article .entry-title a:hover {
+	text-decoration: underline;
+}
+
 /**
  * Widgets
  */