浏览代码

Merge pull request #1425 from Automattic/update/barnsbury-20190925223826

Barnsbury: Minor style adjustment
Takashi Irie 5 年之前
父节点
当前提交
31b1f6acf2

+ 3 - 3
barnsbury/sass/_config-child-theme-deep.scss

@@ -79,7 +79,7 @@ $config-global: (
 			"dark": #DDDDDD, // must be accessible against foreground-default
 			"dark": #DDDDDD, // must be accessible against foreground-default
 		),
 		),
 		"border": (
 		"border": (
-			"default": #DDDDDD,
+			"default": #3C2323,
 			"light": #FAFAFA,
 			"light": #FAFAFA,
 			"dark": #AAAAAA,
 			"dark": #AAAAAA,
 		),
 		),
@@ -134,7 +134,7 @@ $config-elements: (
 		// Colors
 		// Colors
 		"color": (
 		"color": (
 			"text": map-deep-get($config-global, "color", "foreground", "default"),
 			"text": map-deep-get($config-global, "color", "foreground", "default"),
-			"border": map-deep-get($config-global, "color", "border", "default"),
+			"border": map-deep-get($config-global, "color", "border", "dark"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),
 		),
 
 
@@ -317,7 +317,7 @@ $config-header: (
 		// Colors
 		// Colors
 		"color": (
 		"color": (
 			"text": map-deep-get($config-global, "color", "foreground", "default"),
 			"text": map-deep-get($config-global, "color", "foreground", "default"),
-			"link": map-deep-get($config-global, "color", "primary", "default"),
+			"link": map-deep-get($config-global, "color", "foreground", "default"),
 			"link-hover": map-deep-get($config-global, "color", "primary", "hover"),
 			"link-hover": map-deep-get($config-global, "color", "primary", "hover"),
 		),
 		),
 		// Fonts
 		// Fonts

+ 37 - 0
barnsbury/sass/_extra-child-theme.scss

@@ -227,6 +227,7 @@ a {
 /**
 /**
  * Comments
  * Comments
  */
  */
+
 .logged-in-as,
 .logged-in-as,
 .comment-notes,
 .comment-notes,
 .comment-form-cookies-consent {
 .comment-form-cookies-consent {
@@ -340,3 +341,39 @@ a {
 .widget_rss_links li {
 .widget_rss_links li {
 	font-family: inherit;
 	font-family: inherit;
 }
 }
+
+/**
+ * Blocks
+ */
+.wp-block-cover,
+.wp-block-cover-image,
+.has-background {
+	.wp-block-separator {
+		border-color: currentColor;
+	}
+}
+
+.wp-block-latest-posts {
+	> li {
+		> a {
+			color: map-deep-get($config-global, "color", "foreground", "default");
+			display: inline-block;
+			text-decoration: none;
+
+			&:hover,
+			&:focus,
+			&:active {
+				color: map-deep-get($config-global, "color", "primary", "default");
+
+				.has-background:not(.has-background-background-color) & {
+					color: currentColor;
+					text-decoration: underline;
+				}
+			}
+		}
+	}
+	.wp-block-latest-posts__post-excerpt,
+	.wp-block-latest-posts__post-full-content {
+		margin-top: $spacing_unit;
+	}
+}

+ 34 - 0
barnsbury/sass/style-child-theme-editor.scss

@@ -31,3 +31,37 @@
  *   spacing with CSS-variables overrides
  *   spacing with CSS-variables overrides
  */
  */
 @import "../../varia/sass/blocks/editor";
 @import "../../varia/sass/blocks/editor";
+
+
+.wp-block-cover,
+.wp-block-cover-image,
+.has-background {
+	.wp-block-separator {
+		border-color: currentColor;
+	}
+}
+
+.wp-block-latest-posts {
+	> li {
+		> a {
+			color: map-deep-get($config-global, "color", "foreground", "default");
+			display: inline-block;
+			text-decoration: none;
+
+			&:hover,
+			&:focus,
+			&:active {
+				color: map-deep-get($config-global, "color", "primary", "default");
+
+				.has-background:not(.has-background-background-color) & {
+					color: currentColor;
+					text-decoration: underline;
+				}
+			}
+		}
+	}
+	.wp-block-latest-posts__post-excerpt,
+	.wp-block-latest-posts__post-full-content {
+		margin-top: map-deep-get($config-global, "spacing", "unit");
+	}
+}

+ 31 - 5
barnsbury/style-editor.css

@@ -507,9 +507,9 @@ p.has-background:not(.has-background-background-color) a {
 	margin-left: 0;
 	margin-left: 0;
 	margin-right: 0;
 	margin-right: 0;
 	text-align: center;
 	text-align: center;
-	border-top-color: #DDDDDD;
+	border-top-color: #3C2323;
 	border-top-width: 4px;
 	border-top-width: 4px;
-	border-bottom-color: #DDDDDD;
+	border-bottom-color: #3C2323;
 	border-bottom-width: 4px;
 	border-bottom-width: 4px;
 	color: #3C2323;
 	color: #3C2323;
 	/**
 	/**
@@ -600,14 +600,14 @@ p.has-background:not(.has-background-background-color) a {
 
 
 .wp-block-separator,
 .wp-block-separator,
 hr {
 hr {
-	border-bottom: 2.64px solid #DDDDDD;
+	border-bottom: 2.64px solid #3C2323;
 	clear: both;
 	clear: both;
 }
 }
 
 
 .wp-block-separator[style*="text-align:right"], .wp-block-separator[style*="text-align: right"],
 .wp-block-separator[style*="text-align:right"], .wp-block-separator[style*="text-align: right"],
 hr[style*="text-align:right"],
 hr[style*="text-align:right"],
 hr[style*="text-align: right"] {
 hr[style*="text-align: right"] {
-	border-right-color: #DDDDDD;
+	border-right-color: #3C2323;
 }
 }
 
 
 .wp-block-separator.is-style-wide,
 .wp-block-separator.is-style-wide,
@@ -622,7 +622,7 @@ hr.is-style-dots {
 
 
 .wp-block-separator.is-style-dots:before,
 .wp-block-separator.is-style-dots:before,
 hr.is-style-dots:before {
 hr.is-style-dots:before {
-	color: #DDDDDD;
+	color: #3C2323;
 }
 }
 
 
 table th,
 table th,
@@ -880,3 +880,29 @@ table th,
 	/*rtl:ignore*/
 	/*rtl:ignore*/
 	padding-left: 32px !important;
 	padding-left: 32px !important;
 }
 }
+
+.wp-block-cover .wp-block-separator,
+.wp-block-cover-image .wp-block-separator,
+.has-background .wp-block-separator {
+	border-color: currentColor;
+}
+
+.wp-block-latest-posts > li > a {
+	color: #3C2323;
+	display: inline-block;
+	text-decoration: none;
+}
+
+.wp-block-latest-posts > li > a:hover, .wp-block-latest-posts > li > a:focus, .wp-block-latest-posts > li > a:active {
+	color: #20603C;
+}
+
+.has-background:not(.has-background-background-color) .wp-block-latest-posts > li > a:hover, .has-background:not(.has-background-background-color) .wp-block-latest-posts > li > a:focus, .has-background:not(.has-background-background-color) .wp-block-latest-posts > li > a:active {
+	color: currentColor;
+	text-decoration: underline;
+}
+
+.wp-block-latest-posts .wp-block-latest-posts__post-excerpt,
+.wp-block-latest-posts .wp-block-latest-posts__post-full-content {
+	margin-top: 16px;
+}

+ 44 - 15
barnsbury/style-rtl.css

@@ -973,7 +973,7 @@ input[type="datetime-local"],
 input[type="color"],
 input[type="color"],
 textarea {
 textarea {
 	color: #3C2323;
 	color: #3C2323;
-	border: 1px solid #DDDDDD;
+	border: 1px solid #AAAAAA;
 	border-radius: 3px;
 	border-radius: 3px;
 	padding: 16px;
 	padding: 16px;
 }
 }
@@ -999,7 +999,7 @@ textarea:focus {
 }
 }
 
 
 select {
 select {
-	border: 1px solid #DDDDDD;
+	border: 1px solid #AAAAAA;
 }
 }
 
 
 textarea {
 textarea {
@@ -1158,7 +1158,7 @@ input.has-focus[type="submit"],
 	color: #3C2323;
 	color: #3C2323;
 	font-size: 0.84746rem;
 	font-size: 0.84746rem;
 	padding: 16px;
 	padding: 16px;
-	border-color: #DDDDDD;
+	border-color: #3C2323;
 }
 }
 
 
 .wp-block-code pre {
 .wp-block-code pre {
@@ -1767,9 +1767,9 @@ p.has-background {
 	margin-right: 0;
 	margin-right: 0;
 	margin-left: 0;
 	margin-left: 0;
 	text-align: center;
 	text-align: center;
-	border-top-color: #DDDDDD;
+	border-top-color: #3C2323;
 	border-top-width: 4px;
 	border-top-width: 4px;
-	border-bottom-color: #DDDDDD;
+	border-bottom-color: #3C2323;
 	border-bottom-width: 4px;
 	border-bottom-width: 4px;
 	color: #3C2323;
 	color: #3C2323;
 	/**
 	/**
@@ -1904,21 +1904,21 @@ p.has-background {
 }
 }
 
 
 hr {
 hr {
-	border-bottom: 2.64px solid #DDDDDD;
+	border-bottom: 2.64px solid #3C2323;
 	clear: both;
 	clear: both;
 	margin-right: auto;
 	margin-right: auto;
 	margin-left: auto;
 	margin-left: auto;
 }
 }
 
 
 hr.wp-block-separator {
 hr.wp-block-separator {
-	border-bottom: 2.64px solid #DDDDDD;
+	border-bottom: 2.64px solid #3C2323;
 	/**
 	/**
 		 * Block Options
 		 * Block Options
 		 */
 		 */
 }
 }
 
 
 hr.wp-block-separator.is-style-dots:before {
 hr.wp-block-separator.is-style-dots:before {
-	color: #DDDDDD;
+	color: #3C2323;
 	font-size: 1.64303rem;
 	font-size: 1.64303rem;
 	letter-spacing: 0.84746rem;
 	letter-spacing: 0.84746rem;
 	padding-right: 0.84746rem;
 	padding-right: 0.84746rem;
@@ -2467,7 +2467,7 @@ table th,
 }
 }
 
 
 .main-navigation a {
 .main-navigation a {
-	color: #20603C;
+	color: #3C2323;
 	display: block;
 	display: block;
 	font-family: "Rubik", Trebuchet MS, Lucida Grande, Lucida Sans Unicode, Lucida Sans, Tahoma, sans-serif;
 	font-family: "Rubik", Trebuchet MS, Lucida Grande, Lucida Sans Unicode, Lucida Sans, Tahoma, sans-serif;
 	font-size: 1rem;
 	font-size: 1rem;
@@ -2482,7 +2482,7 @@ table th,
 }
 }
 
 
 .main-navigation a:link, .main-navigation a:visited {
 .main-navigation a:link, .main-navigation a:visited {
-	color: #20603C;
+	color: #3C2323;
 }
 }
 
 
 .main-navigation a:hover {
 .main-navigation a:hover {
@@ -2727,7 +2727,7 @@ table th,
 }
 }
 
 
 .entry-content .more-link {
 .entry-content .more-link {
-	display: inline;
+	display: block;
 	color: inherit;
 	color: inherit;
 }
 }
 
 
@@ -2879,13 +2879,13 @@ table th,
  * Comment Lists
  * Comment Lists
  */
  */
 .comment-list {
 .comment-list {
-	border-bottom: 1px solid #DDDDDD;
+	border-bottom: 1px solid #3C2323;
 	margin-right: 0;
 	margin-right: 0;
 	list-style: none;
 	list-style: none;
 }
 }
 
 
 .comment-list > li {
 .comment-list > li {
-	border-top: 1px solid #DDDDDD;
+	border-top: 1px solid #3C2323;
 	margin-top: 32px;
 	margin-top: 32px;
 	margin-bottom: 32px;
 	margin-bottom: 32px;
 }
 }
@@ -2896,7 +2896,7 @@ table th,
 }
 }
 
 
 .children > li {
 .children > li {
-	border-top: 1px solid #DDDDDD;
+	border-top: 1px solid #3C2323;
 	margin-top: 32px;
 	margin-top: 32px;
 	margin-bottom: 32px;
 	margin-bottom: 32px;
 }
 }
@@ -3416,7 +3416,7 @@ body .widget_eu_cookie_law_widget.widget.top {
 
 
 body .widget_eu_cookie_law_widget #eu-cookie-law {
 body .widget_eu_cookie_law_widget #eu-cookie-law {
 	background: #FFFDF6;
 	background: #FFFDF6;
-	border: 1px solid #DDDDDD;
+	border: 1px solid #3C2323;
 	color: #3C2323;
 	color: #3C2323;
 	font-size: 0.84746rem;
 	font-size: 0.84746rem;
 	line-height: inherit;
 	line-height: inherit;
@@ -3839,3 +3839,32 @@ body.admin-bar .widget_eu_cookie_law_widget.widget.top {
 .widget_rss_links li {
 .widget_rss_links li {
 	font-family: inherit;
 	font-family: inherit;
 }
 }
+
+/**
+ * Blocks
+ */
+.wp-block-cover .wp-block-separator,
+.wp-block-cover-image .wp-block-separator,
+.has-background .wp-block-separator {
+	border-color: currentColor;
+}
+
+.wp-block-latest-posts > li > a {
+	color: #3C2323;
+	display: inline-block;
+	text-decoration: none;
+}
+
+.wp-block-latest-posts > li > a:hover, .wp-block-latest-posts > li > a:focus, .wp-block-latest-posts > li > a:active {
+	color: #20603C;
+}
+
+.has-background:not(.has-background-background-color) .wp-block-latest-posts > li > a:hover, .has-background:not(.has-background-background-color) .wp-block-latest-posts > li > a:focus, .has-background:not(.has-background-background-color) .wp-block-latest-posts > li > a:active {
+	color: currentColor;
+	text-decoration: underline;
+}
+
+.wp-block-latest-posts .wp-block-latest-posts__post-excerpt,
+.wp-block-latest-posts .wp-block-latest-posts__post-full-content {
+	margin-top: 16px;
+}

+ 44 - 15
barnsbury/style.css

@@ -973,7 +973,7 @@ input[type="datetime-local"],
 input[type="color"],
 input[type="color"],
 textarea {
 textarea {
 	color: #3C2323;
 	color: #3C2323;
-	border: 1px solid #DDDDDD;
+	border: 1px solid #AAAAAA;
 	border-radius: 3px;
 	border-radius: 3px;
 	padding: 16px;
 	padding: 16px;
 }
 }
@@ -999,7 +999,7 @@ textarea:focus {
 }
 }
 
 
 select {
 select {
-	border: 1px solid #DDDDDD;
+	border: 1px solid #AAAAAA;
 }
 }
 
 
 textarea {
 textarea {
@@ -1158,7 +1158,7 @@ input.has-focus[type="submit"],
 	color: #3C2323;
 	color: #3C2323;
 	font-size: 0.84746rem;
 	font-size: 0.84746rem;
 	padding: 16px;
 	padding: 16px;
-	border-color: #DDDDDD;
+	border-color: #3C2323;
 }
 }
 
 
 .wp-block-code pre {
 .wp-block-code pre {
@@ -1767,9 +1767,9 @@ p.has-background {
 	margin-left: 0;
 	margin-left: 0;
 	margin-right: 0;
 	margin-right: 0;
 	text-align: center;
 	text-align: center;
-	border-top-color: #DDDDDD;
+	border-top-color: #3C2323;
 	border-top-width: 4px;
 	border-top-width: 4px;
-	border-bottom-color: #DDDDDD;
+	border-bottom-color: #3C2323;
 	border-bottom-width: 4px;
 	border-bottom-width: 4px;
 	color: #3C2323;
 	color: #3C2323;
 	/**
 	/**
@@ -1904,21 +1904,21 @@ p.has-background {
 }
 }
 
 
 hr {
 hr {
-	border-bottom: 2.64px solid #DDDDDD;
+	border-bottom: 2.64px solid #3C2323;
 	clear: both;
 	clear: both;
 	margin-left: auto;
 	margin-left: auto;
 	margin-right: auto;
 	margin-right: auto;
 }
 }
 
 
 hr.wp-block-separator {
 hr.wp-block-separator {
-	border-bottom: 2.64px solid #DDDDDD;
+	border-bottom: 2.64px solid #3C2323;
 	/**
 	/**
 		 * Block Options
 		 * Block Options
 		 */
 		 */
 }
 }
 
 
 hr.wp-block-separator.is-style-dots:before {
 hr.wp-block-separator.is-style-dots:before {
-	color: #DDDDDD;
+	color: #3C2323;
 	font-size: 1.64303rem;
 	font-size: 1.64303rem;
 	letter-spacing: 0.84746rem;
 	letter-spacing: 0.84746rem;
 	padding-left: 0.84746rem;
 	padding-left: 0.84746rem;
@@ -2484,7 +2484,7 @@ table th,
 }
 }
 
 
 .main-navigation a {
 .main-navigation a {
-	color: #20603C;
+	color: #3C2323;
 	display: block;
 	display: block;
 	font-family: "Rubik", Trebuchet MS, Lucida Grande, Lucida Sans Unicode, Lucida Sans, Tahoma, sans-serif;
 	font-family: "Rubik", Trebuchet MS, Lucida Grande, Lucida Sans Unicode, Lucida Sans, Tahoma, sans-serif;
 	font-size: 1rem;
 	font-size: 1rem;
@@ -2499,7 +2499,7 @@ table th,
 }
 }
 
 
 .main-navigation a:link, .main-navigation a:visited {
 .main-navigation a:link, .main-navigation a:visited {
-	color: #20603C;
+	color: #3C2323;
 }
 }
 
 
 .main-navigation a:hover {
 .main-navigation a:hover {
@@ -2744,7 +2744,7 @@ table th,
 }
 }
 
 
 .entry-content .more-link {
 .entry-content .more-link {
-	display: inline;
+	display: block;
 	color: inherit;
 	color: inherit;
 }
 }
 
 
@@ -2896,13 +2896,13 @@ table th,
  * Comment Lists
  * Comment Lists
  */
  */
 .comment-list {
 .comment-list {
-	border-bottom: 1px solid #DDDDDD;
+	border-bottom: 1px solid #3C2323;
 	margin-left: 0;
 	margin-left: 0;
 	list-style: none;
 	list-style: none;
 }
 }
 
 
 .comment-list > li {
 .comment-list > li {
-	border-top: 1px solid #DDDDDD;
+	border-top: 1px solid #3C2323;
 	margin-top: 32px;
 	margin-top: 32px;
 	margin-bottom: 32px;
 	margin-bottom: 32px;
 }
 }
@@ -2913,7 +2913,7 @@ table th,
 }
 }
 
 
 .children > li {
 .children > li {
-	border-top: 1px solid #DDDDDD;
+	border-top: 1px solid #3C2323;
 	margin-top: 32px;
 	margin-top: 32px;
 	margin-bottom: 32px;
 	margin-bottom: 32px;
 }
 }
@@ -3445,7 +3445,7 @@ body .widget_eu_cookie_law_widget.widget.top {
 
 
 body .widget_eu_cookie_law_widget #eu-cookie-law {
 body .widget_eu_cookie_law_widget #eu-cookie-law {
 	background: #FFFDF6;
 	background: #FFFDF6;
-	border: 1px solid #DDDDDD;
+	border: 1px solid #3C2323;
 	color: #3C2323;
 	color: #3C2323;
 	font-size: 0.84746rem;
 	font-size: 0.84746rem;
 	line-height: inherit;
 	line-height: inherit;
@@ -3868,3 +3868,32 @@ body.admin-bar .widget_eu_cookie_law_widget.widget.top {
 .widget_rss_links li {
 .widget_rss_links li {
 	font-family: inherit;
 	font-family: inherit;
 }
 }
+
+/**
+ * Blocks
+ */
+.wp-block-cover .wp-block-separator,
+.wp-block-cover-image .wp-block-separator,
+.has-background .wp-block-separator {
+	border-color: currentColor;
+}
+
+.wp-block-latest-posts > li > a {
+	color: #3C2323;
+	display: inline-block;
+	text-decoration: none;
+}
+
+.wp-block-latest-posts > li > a:hover, .wp-block-latest-posts > li > a:focus, .wp-block-latest-posts > li > a:active {
+	color: #20603C;
+}
+
+.has-background:not(.has-background-background-color) .wp-block-latest-posts > li > a:hover, .has-background:not(.has-background-background-color) .wp-block-latest-posts > li > a:focus, .has-background:not(.has-background-background-color) .wp-block-latest-posts > li > a:active {
+	color: currentColor;
+	text-decoration: underline;
+}
+
+.wp-block-latest-posts .wp-block-latest-posts__post-excerpt,
+.wp-block-latest-posts .wp-block-latest-posts__post-full-content {
+	margin-top: 16px;
+}