Browse Source

Merge branch 'enhancement/add-wc-support' into enhancement/add-wc-support-redhill

Allan Cole 5 years ago
parent
commit
98937fe815

+ 2 - 1
exford/sass/_extra-child-theme.scss

@@ -88,8 +88,9 @@ a {
 
 
 			> div > ul > li > .sub-menu {
 			> div > ul > li > .sub-menu {
 				border: 1px solid map-deep-get($config-global, "color", "border", "default");
 				border: 1px solid map-deep-get($config-global, "color", "border", "default");
-				box-shadow: none;
 				border-radius: map-deep-get($config-global, "border-radius", "sm");
 				border-radius: map-deep-get($config-global, "border-radius", "sm");
+				box-shadow: none;
+				box-sizing: content-box; // for Safari
 			}
 			}
 		}
 		}
 	}
 	}

+ 7 - 4
exford/style-rtl.css

@@ -684,9 +684,7 @@ a {
 .site-header:after,
 .site-header:after,
 .site-content:after,
 .site-content:after,
 .site-footer:after {
 .site-footer:after {
-	content: "";
-	display: table;
-	table-layout: fixed;
+	clear: both;
 }
 }
 
 
 /**
 /**
@@ -1967,6 +1965,10 @@ hr.wp-block-separator {
 		 */
 		 */
 }
 }
 
 
+hr.wp-block-separator:not(.is-style-wide):not(.is-style-dots) {
+	max-width: 96px;
+}
+
 hr.wp-block-separator.is-style-dots:before {
 hr.wp-block-separator.is-style-dots:before {
 	color: #CCCCCC;
 	color: #CCCCCC;
 	font-size: 1.728rem;
 	font-size: 1.728rem;
@@ -3681,8 +3683,9 @@ p:not(.site-title) a:hover {
 	}
 	}
 	.site-header > *.main-navigation > div > ul > li > .sub-menu {
 	.site-header > *.main-navigation > div > ul > li > .sub-menu {
 		border: 1px solid #CCCCCC;
 		border: 1px solid #CCCCCC;
-		box-shadow: none;
 		border-radius: 5px;
 		border-radius: 5px;
+		box-shadow: none;
+		box-sizing: content-box;
 	}
 	}
 }
 }
 
 

+ 7 - 4
exford/style.css

@@ -684,9 +684,7 @@ a {
 .site-header:after,
 .site-header:after,
 .site-content:after,
 .site-content:after,
 .site-footer:after {
 .site-footer:after {
-	content: "";
-	display: table;
-	table-layout: fixed;
+	clear: both;
 }
 }
 
 
 /**
 /**
@@ -1967,6 +1965,10 @@ hr.wp-block-separator {
 		 */
 		 */
 }
 }
 
 
+hr.wp-block-separator:not(.is-style-wide):not(.is-style-dots) {
+	max-width: 96px;
+}
+
 hr.wp-block-separator.is-style-dots:before {
 hr.wp-block-separator.is-style-dots:before {
 	color: #CCCCCC;
 	color: #CCCCCC;
 	font-size: 1.728rem;
 	font-size: 1.728rem;
@@ -3710,8 +3712,9 @@ p:not(.site-title) a:hover {
 	}
 	}
 	.site-header > *.main-navigation > div > ul > li > .sub-menu {
 	.site-header > *.main-navigation > div > ul > li > .sub-menu {
 		border: 1px solid #CCCCCC;
 		border: 1px solid #CCCCCC;
-		box-shadow: none;
 		border-radius: 5px;
 		border-radius: 5px;
+		box-shadow: none;
+		box-sizing: content-box;
 	}
 	}
 }
 }
 
 

+ 3 - 1
rockfield/sass/_extra-child-theme.scss

@@ -617,9 +617,11 @@ table,
 }
 }
 
 
 /**
 /**
- * Footer Menu
+ * Footer
  */
  */
 .site-footer {
 .site-footer {
+	align-items: unset;
+	flex-direction: column;
 	padding-left: 0;
 	padding-left: 0;
 	padding-right: 0;
 	padding-right: 0;
 }
 }

+ 4 - 4
rockfield/style-rtl.css

@@ -684,9 +684,7 @@ a {
 .site-header:after,
 .site-header:after,
 .site-content:after,
 .site-content:after,
 .site-footer:after {
 .site-footer:after {
-	content: "";
-	display: table;
-	table-layout: fixed;
+	clear: both;
 }
 }
 
 
 /**
 /**
@@ -4205,9 +4203,11 @@ table th,
 }
 }
 
 
 /**
 /**
- * Footer Menu
+ * Footer
  */
  */
 .site-footer {
 .site-footer {
+	align-items: unset;
+	flex-direction: column;
 	padding-right: 0;
 	padding-right: 0;
 	padding-left: 0;
 	padding-left: 0;
 }
 }

+ 4 - 4
rockfield/style.css

@@ -684,9 +684,7 @@ a {
 .site-header:after,
 .site-header:after,
 .site-content:after,
 .site-content:after,
 .site-footer:after {
 .site-footer:after {
-	content: "";
-	display: table;
-	table-layout: fixed;
+	clear: both;
 }
 }
 
 
 /**
 /**
@@ -4234,9 +4232,11 @@ table th,
 }
 }
 
 
 /**
 /**
- * Footer Menu
+ * Footer
  */
  */
 .site-footer {
 .site-footer {
+	align-items: unset;
+	flex-direction: column;
 	padding-left: 0;
 	padding-left: 0;
 	padding-right: 0;
 	padding-right: 0;
 }
 }

+ 1 - 1
varia/sass/base/_extends.scss

@@ -36,7 +36,7 @@
 	color: map-deep-get($config-global, "color", "foreground", "dark");
 	color: map-deep-get($config-global, "color", "foreground", "dark");
 	font-size: map-deep-get($config-global, "font", "size", "sm");
 	font-size: map-deep-get($config-global, "font", "size", "sm");
 	font-weight: 700;
 	font-weight: 700;
-	font-family: #{map-deep-get($config-global, "font", "family", "primary")};
+	@include font-family( map-deep-get($config-global, "font", "family", "primary") );
 	min-height: 3.236rem;
 	min-height: 3.236rem;
 	min-width: 3.236rem;
 	min-width: 3.236rem;
 	padding: 0.202rem;
 	padding: 0.202rem;

+ 3 - 0
varia/sass/blocks/utilities/_style.scss

@@ -23,7 +23,10 @@
  */
  */
 .aligncenter {
 .aligncenter {
 	clear: both;
 	clear: both;
+	display: block;
 	float: none;
 	float: none;
+	margin-right: auto;
+	margin-left: auto;
 	text-align: center;
 	text-align: center;
 }
 }
 
 

+ 10 - 1
varia/sass/components/comments/_comments.scss

@@ -86,10 +86,15 @@
 	}
 	}
 
 
 	.comment-author {
 	.comment-author {
+		line-height: #{map-deep-get($config-global, "font", "line-height", "heading")};
+		margin-bottom: #{.25 * map-deep-get($config-global, "spacing", "unit")};
+		padding-right: #{2.5 * map-deep-get($config-global, "spacing", "horizontal")};
 
 
 		@include media(mobile) {
 		@include media(mobile) {
 			display: flex;
 			display: flex;
 			align-items: center;
 			align-items: center;
+			margin-bottom: 0;
+			padding-right: 0;
 		}
 		}
 
 
 		.avatar {
 		.avatar {
@@ -107,8 +112,12 @@
 	}
 	}
 
 
 	.comment-metadata {
 	.comment-metadata {
-
 		color: #{map-deep-get($config-global, "color", "foreground", "default")};
 		color: #{map-deep-get($config-global, "color", "foreground", "default")};
+		padding-right: #{2.5 * map-deep-get($config-global, "spacing", "horizontal")};
+
+		@include media(mobile) {
+			padding-right: 0;
+		}
 
 
 		a {
 		a {
 			color: currentColor;
 			color: currentColor;

+ 18 - 0
varia/style-rtl.css

@@ -2110,7 +2110,10 @@ table th,
  */
  */
 .aligncenter {
 .aligncenter {
 	clear: both;
 	clear: both;
+	display: block;
 	float: none;
 	float: none;
+	margin-left: auto;
+	margin-right: auto;
 	text-align: center;
 	text-align: center;
 }
 }
 
 
@@ -3062,10 +3065,18 @@ body:not(.fse-enabled) .footer-menu a {
 	}
 	}
 }
 }
 
 
+.comment-meta .comment-author {
+	line-height: 1.125;
+	margin-bottom: 4px;
+	padding-left: 40px;
+}
+
 @media only screen and (min-width: 560px) {
 @media only screen and (min-width: 560px) {
 	.comment-meta .comment-author {
 	.comment-meta .comment-author {
 		display: flex;
 		display: flex;
 		align-items: center;
 		align-items: center;
+		margin-bottom: 0;
+		padding-left: 0;
 	}
 	}
 }
 }
 
 
@@ -3086,6 +3097,13 @@ body:not(.fse-enabled) .footer-menu a {
 
 
 .comment-meta .comment-metadata {
 .comment-meta .comment-metadata {
 	color: #444444;
 	color: #444444;
+	padding-left: 40px;
+}
+
+@media only screen and (min-width: 560px) {
+	.comment-meta .comment-metadata {
+		padding-left: 0;
+	}
 }
 }
 
 
 .comment-meta .comment-metadata a {
 .comment-meta .comment-metadata a {

+ 2 - 1
varia/style-woocommerce-rtl.css

@@ -285,7 +285,8 @@ body[class*="woocommerce"] #page span.onsale, #content .wc-block-grid .wc-block-
 	color: #111111;
 	color: #111111;
 	font-size: 0.83333rem;
 	font-size: 0.83333rem;
 	font-weight: 700;
 	font-weight: 700;
-	font-family: ("fallback": "sans-serif", "css-var": "--font-headings");
+	font-family: sans-serif;
+	font-family: var(--font-headings, sans-serif);
 	min-height: 3.236rem;
 	min-height: 3.236rem;
 	min-width: 3.236rem;
 	min-width: 3.236rem;
 	padding: 0.202rem;
 	padding: 0.202rem;

+ 2 - 1
varia/style-woocommerce.css

@@ -285,7 +285,8 @@ body[class*="woocommerce"] #page span.onsale, #content .wc-block-grid .wc-block-
 	color: #111111;
 	color: #111111;
 	font-size: 0.83333rem;
 	font-size: 0.83333rem;
 	font-weight: 700;
 	font-weight: 700;
-	font-family: ("fallback": "sans-serif", "css-var": "--font-headings");
+	font-family: sans-serif;
+	font-family: var(--font-headings, sans-serif);
 	min-height: 3.236rem;
 	min-height: 3.236rem;
 	min-width: 3.236rem;
 	min-width: 3.236rem;
 	padding: 0.202rem;
 	padding: 0.202rem;

+ 18 - 0
varia/style.css

@@ -2113,7 +2113,10 @@ table th,
  */
  */
 .aligncenter {
 .aligncenter {
 	clear: both;
 	clear: both;
+	display: block;
 	float: none;
 	float: none;
+	margin-right: auto;
+	margin-left: auto;
 	text-align: center;
 	text-align: center;
 }
 }
 
 
@@ -3079,10 +3082,18 @@ body:not(.fse-enabled) .footer-menu a {
 	}
 	}
 }
 }
 
 
+.comment-meta .comment-author {
+	line-height: 1.125;
+	margin-bottom: 4px;
+	padding-right: 40px;
+}
+
 @media only screen and (min-width: 560px) {
 @media only screen and (min-width: 560px) {
 	.comment-meta .comment-author {
 	.comment-meta .comment-author {
 		display: flex;
 		display: flex;
 		align-items: center;
 		align-items: center;
+		margin-bottom: 0;
+		padding-right: 0;
 	}
 	}
 }
 }
 
 
@@ -3103,6 +3114,13 @@ body:not(.fse-enabled) .footer-menu a {
 
 
 .comment-meta .comment-metadata {
 .comment-meta .comment-metadata {
 	color: #444444;
 	color: #444444;
+	padding-right: 40px;
+}
+
+@media only screen and (min-width: 560px) {
+	.comment-meta .comment-metadata {
+		padding-right: 0;
+	}
 }
 }
 
 
 .comment-meta .comment-metadata a {
 .comment-meta .comment-metadata a {