Просмотр исходного кода

Merge branch 'enhancement/add-wc-support-alves' into enhancement/add-wc-support-maywood

Allan Cole 5 лет назад
Родитель
Сommit
53e9eb93ca

+ 2 - 0
alves/package.json

@@ -36,7 +36,9 @@
     "start": "chokidar \"**/*.scss\" -c \"npm run build\" --initial",
     "build:style": "node-sass sass/style-child-theme.scss style.css --output-style expanded --indent-type tab --indent-width 1 && postcss -r style.css",
     "build:style-editor": "node-sass sass/style-child-theme-editor.scss style-editor.css --output-style expanded --indent-type tab --indent-width 1 && postcss -r style-editor.css",
+    "build:woocommerce": "node-sass sass/style-child-theme-woocommerce.scss style-woocommerce.css --output-style expanded --indent-type tab --indent-width 1 && postcss -r style-woocommerce.css",
     "build:rtl": "rtlcss style.css style-rtl.css",
+    "build:woocommerce-rtl": "rtlcss style-woocommerce.css style-woocommerce-rtl.css",
     "build:print": "node-sass sass/print.scss print.css --output-style expanded --indent-type tab --indent-width 1 && postcss -r print.css",
     "build": "run-p \"build:*\"",
     "watch": "chokidar \"**/*.scss\" -c \"npm run build\" --initial"

+ 6 - 0
alves/sass/_config-child-theme-deep.scss

@@ -92,6 +92,12 @@ $config-global: (
 			"light": #fcfbf9,
 			"dark": #9B6A36,
 		),
+		"alert": (
+			"success": yellowgreen,
+			"info": skyblue,
+			"warning": gold,
+			"error": salmon,
+		),
 		"text-selection": lightblue,
 		"black": black,
 		"white": white,

+ 7 - 2
alves/sass/_extra-child-theme.scss

@@ -215,8 +215,14 @@ blockquote p {
 
 		.main-navigation {
 			align-self: center;
-			justify-self: flex-end;
+			display: flex;
+			justify-content: flex-end;
 			grid-area: main-navigation;
+			flex-wrap: wrap;
+
+			& > div {
+				justify-content: flex-end;
+			}
 
 			& > div > ul {
 				justify-content: flex-end;
@@ -319,7 +325,6 @@ blockquote p {
 	text-align: left;
 }
 
-.main-navigation > div > ul,
 .pagination .nav-links {
 	justify-content: center;
 }

+ 16 - 0
alves/sass/style-child-theme-woocommerce.scss

@@ -39,3 +39,19 @@
  * WooCommerce Styles
  */
 @import "../../varia/sass/vendors/woocommerce/style";
+
+// Fix margins for header layout
+@include media(mobile) {
+	body[class*="woocommerce"] #page .main-navigation > div:not(:last-of-type) {
+		margin-right: 0;
+	}
+
+	body[class*="woocommerce"] #page .main-navigation > div:last-of-type {
+		margin-left: #{map-deep-get($config-global, "spacing", "unit")};
+	}
+}
+
+// Fix mini-cart padding
+body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget {
+	padding: #{map-deep-get($config-global, "spacing", "unit")};
+}

+ 100 - 77
alves/style-rtl.css

@@ -188,6 +188,84 @@ $grid-configuration: map-extend($grid-configuration-default, $grid-configuration
  * Base
  * - Reset the browser
  */
+/**
+ * Button Placeholder style
+ * - Since buttons appear in various blocks,
+ *   let’s use a placeholder to keep them all
+ *   in-sync
+ */
+button,
+.button,
+input[type="submit"],
+.wp-block-button__link,
+.wp-block-file__button, .a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept {
+	line-height: 1;
+	color: #ffffff;
+	cursor: pointer;
+	font-weight: bold;
+	font-family: "Karla", Arial, sans-serif;
+	font-family: var(--font-base, "Karla", Arial, sans-serif);
+	font-size: 1.04167rem;
+	background-color: #3E7D98;
+	border-radius: 160px;
+	border-width: 0;
+	padding: 16px 48px;
+}
+
+button:before,
+.button:before,
+input[type="submit"]:before,
+.wp-block-button__link:before,
+.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before, button:after,
+.button:after,
+input[type="submit"]:after,
+.wp-block-button__link:after,
+.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
+	content: '';
+	display: block;
+	height: 0;
+	width: 0;
+}
+
+button:before,
+.button:before,
+input[type="submit"]:before,
+.wp-block-button__link:before,
+.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before {
+	margin-bottom: -0.12em;
+}
+
+button:after,
+.button:after,
+input[type="submit"]:after,
+.wp-block-button__link:after,
+.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
+	margin-top: -0.11em;
+}
+
+button:hover,
+.button:hover,
+input:hover[type="submit"],
+.wp-block-button__link:hover,
+.wp-block-file__button:hover, .a8c-posts-list__view-all:hover, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:hover, button:focus,
+.button:focus,
+input:focus[type="submit"],
+.wp-block-button__link:focus,
+.wp-block-file__button:focus, .a8c-posts-list__view-all:focus, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:focus, button.has-focus,
+.has-focus.button,
+input.has-focus[type="submit"],
+.has-focus.wp-block-button__link,
+.has-focus.wp-block-file__button, .has-focus.a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.has-focus.accept {
+	color: #ffffff;
+	background-color: #2f5f74;
+}
+
+/**
+ * Onsale Placeholder style
+ * - Since buttons appear in various blocks,
+ *   let’s use a placeholder to keep them all
+ *   in-sync
+ */
 /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
 /* Document
    ========================================================================== */
@@ -859,7 +937,8 @@ footer {
 .post-thumbnail > *,
 .page-content > *,
 .comment-content > *,
-.author-bio > * {
+.author-bio > *,
+.widget-area > .widget > * {
 	margin-top: 16px;
 	margin-bottom: 16px;
 }
@@ -869,7 +948,8 @@ footer {
 .post-thumbnail > *:first-child,
 .page-content > *:first-child,
 .comment-content > *:first-child,
-.author-bio > *:first-child {
+.author-bio > *:first-child,
+.widget-area > .widget > *:first-child {
 	margin-top: 0;
 }
 
@@ -878,7 +958,8 @@ footer {
 .post-thumbnail > *:last-child,
 .page-content > *:last-child,
 .comment-content > *:last-child,
-.author-bio > *:last-child {
+.author-bio > *:last-child,
+.widget-area > .widget > *:last-child {
 	margin-bottom: 0;
 }
 
@@ -1069,77 +1150,8 @@ object {
 }
 
 /**
- * Placeholder button style
- * - Since buttons appear in various blocks,
- *   let’s use a placeholder to keep them all
- *   in-sync
+ * Button
  */
-button,
-.button,
-input[type="submit"],
-.wp-block-button__link,
-.wp-block-file__button, .a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept {
-	line-height: 1;
-	color: #ffffff;
-	cursor: pointer;
-	font-weight: bold;
-	font-family: "Karla", Arial, sans-serif;
-	font-family: var(--font-base, "Karla", Arial, sans-serif);
-	font-size: 1.04167rem;
-	background-color: #3E7D98;
-	border-radius: 160px;
-	border-width: 0;
-	padding: 16px 48px;
-}
-
-button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
-.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
-.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
-	content: '';
-	display: block;
-	height: 0;
-	width: 0;
-}
-
-button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
-.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before {
-	margin-bottom: -0.12em;
-}
-
-button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
-.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
-	margin-top: -0.11em;
-}
-
-button:hover,
-.button:hover,
-input:hover[type="submit"],
-.wp-block-button__link:hover,
-.wp-block-file__button:hover, .a8c-posts-list__view-all:hover, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:hover, button:focus,
-.button:focus,
-input:focus[type="submit"],
-.wp-block-button__link:focus,
-.wp-block-file__button:focus, .a8c-posts-list__view-all:focus, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:focus, button.has-focus,
-.has-focus.button,
-input.has-focus[type="submit"],
-.has-focus.wp-block-button__link,
-.has-focus.wp-block-file__button, .has-focus.a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.has-focus.accept {
-	color: #ffffff;
-	background-color: #2f5f74;
-}
-
 /**
  * Block Options
  */
@@ -2405,7 +2417,7 @@ body:not(.fse-enabled) .site-description {
 	margin: 0;
 }
 
-.main-navigation #toggle:checked ~ div {
+.main-navigation #toggle:checked ~ div:not(.woocommerce-menu-container) {
 	display: block;
 }
 
@@ -2429,7 +2441,7 @@ body:not(.fse-enabled) .site-description {
 
 @media only screen and (min-width: 560px) {
 	.main-navigation > div {
-		display: block;
+		display: inline-block;
 	}
 	.main-navigation #toggle-menu {
 		display: none;
@@ -2815,6 +2827,13 @@ body:not(.fse-enabled) .footer-menu a {
 .entry-content .more-link {
 	display: block;
 	color: inherit;
+	margin-top: 16px;
+}
+
+@media only screen and (min-width: 560px) {
+	.entry-content .more-link {
+		margin-top: 32px;
+	}
 }
 
 .entry-content .more-link:after {
@@ -3798,8 +3817,13 @@ blockquote p {
 	}
 	.site-header .main-navigation {
 		align-self: center;
-		justify-self: flex-end;
+		display: flex;
+		justify-content: flex-end;
 		grid-area: main-navigation;
+		flex-wrap: wrap;
+	}
+	.site-header .main-navigation > div {
+		justify-content: flex-end;
 	}
 	.site-header .main-navigation > div > ul {
 		justify-content: flex-end;
@@ -3871,7 +3895,6 @@ blockquote p {
 	text-align: right;
 }
 
-.main-navigation > div > ul,
 .pagination .nav-links {
 	justify-content: center;
 }

+ 76 - 26
alves/style-woocommerce-rtl.css

@@ -832,7 +832,7 @@ body[class*="woocommerce"] #page .main-navigation #toggle-cart {
 }
 
 body[class*="woocommerce"] #page .main-navigation #toggle-cart .svg-icon {
-	vertical-align: text-top;
+	vertical-align: middle;
 }
 
 body[class*="woocommerce"] #page .main-navigation #woocommerce-toggle:checked ~ div {
@@ -853,22 +853,11 @@ body[class*="woocommerce"] #page .main-navigation #woocommerce-toggle:checked +
 	display: inline;
 }
 
-@media only screen and (min-width: 560px) {
-	body[class*="woocommerce"] #page .main-navigation > div:not(:last-of-type) {
-		margin-left: 32px;
-	}
-	body[class*="woocommerce"] #page .main-navigation #toggle-cart {
-		display: none;
-	}
-}
-
 @media only screen and (max-width: 559px) {
 	body[class*="woocommerce"] #page .main-navigation .woocommerce-menu-container {
 		background-color: #3E7D98;
 		color: #ffffff;
-		padding-top: 16px;
-		padding-right: 16px;
-		padding-left: 16px;
+		padding: 0;
 		width: 100%;
 	}
 	body[class*="woocommerce"] #page .main-navigation .woocommerce-menu-container a,
@@ -878,6 +867,15 @@ body[class*="woocommerce"] #page .main-navigation #woocommerce-toggle:checked +
 	}
 }
 
+@media only screen and (min-width: 560px) {
+	body[class*="woocommerce"] #page .main-navigation > div:not(:last-of-type) {
+		margin-left: 32px;
+	}
+	body[class*="woocommerce"] #page .main-navigation #toggle-cart {
+		display: none;
+	}
+}
+
 body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-link {
 	display: none;
 	text-decoration: none;
@@ -901,7 +899,7 @@ body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-link .svg-ic
 	float: right;
 	height: 1.04167rem;
 	width: 1.04167rem;
-	vertical-align: top;
+	vertical-align: middle;
 }
 
 @media only screen and (min-width: 560px) {
@@ -914,7 +912,7 @@ body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget {
 	background-color: #3E7D98;
 	color: #ffffff;
 	max-width: 100%;
-	padding: 0;
+	padding: 16px 0;
 }
 
 @media only screen and (min-width: 560px) {
@@ -932,6 +930,11 @@ body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .wooc
 	border-top: 1px solid #ffffff;
 }
 
+body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .woocommerce.widget_shopping_cart .cart_list a:hover,
+body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .woocommerce.widget_shopping_cart .cart_list a:focus {
+	background-color: transparent;
+}
+
 body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .woocommerce.widget_shopping_cart .cart_list a.remove:hover,
 body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .woocommerce.widget_shopping_cart .cart_list a.remove:focus {
 	text-decoration: none;
@@ -1855,7 +1858,7 @@ body[class*="woocommerce"] #page .woocommerce-invalid #terms {
  * Account page
  */
 body[class*="woocommerce"] #page .entry-content .woocommerce-MyAccount-navigation {
-	width: 20%;
+	width: 100%;
 }
 
 body[class*="woocommerce"] #page .entry-content .woocommerce-MyAccount-navigation ul li a {
@@ -1867,8 +1870,14 @@ body[class*="woocommerce"] #page .entry-content .woocommerce-MyAccount-navigatio
 	margin-top: 0;
 }
 
+@media only screen and (min-width: 640px) {
+	body[class*="woocommerce"] #page .entry-content .woocommerce-MyAccount-navigation {
+		width: 20%;
+	}
+}
+
 body[class*="woocommerce"] #page .woocommerce-MyAccount-content {
-	width: calc(80% - 16px);
+	width: 100%;
 }
 
 body[class*="woocommerce"] #page .woocommerce-MyAccount-content .woocommerce-notices-wrapper:empty {
@@ -1881,6 +1890,12 @@ body[class*="woocommerce"] #page .woocommerce-MyAccount-content fieldset {
 	border-radius: 3px;
 }
 
+@media only screen and (min-width: 640px) {
+	body[class*="woocommerce"] #page .woocommerce-MyAccount-content {
+		width: calc(80% - 16px);
+	}
+}
+
 body[class*="woocommerce"] #page .addresses .title h3 {
 	font-size: 1.25rem;
 }
@@ -1922,11 +1937,6 @@ body[class*="woocommerce"] #page .woocommerce-ordering select {
 /**
  * Single Product Page
  */
-.single-product #page #woocommerce-wrapper div.product > .onsale {
-	left: auto;
-	right: -0.5em;
-}
-
 .single-product #page #woocommerce-wrapper div.product div.images {
 	margin-bottom: 32px;
 }
@@ -1964,6 +1974,27 @@ body[class*="woocommerce"] #page .woocommerce-ordering select {
 .single-product #page #woocommerce-wrapper div.product div.summary p.price {
 	color: #253136;
 	font-size: 2.16rem;
+	line-height: 1.125;
+}
+
+.single-product #page #woocommerce-wrapper div.product div.summary span.price del,
+.single-product #page #woocommerce-wrapper div.product div.summary p.price del {
+	color: currentColor;
+	opacity: 0.5;
+	display: inline-block;
+}
+
+.single-product #page #woocommerce-wrapper div.product div.summary span.price ins,
+.single-product #page #woocommerce-wrapper div.product div.summary p.price ins {
+	background: none;
+	font-weight: 700;
+	display: inline-block;
+}
+
+.single-product #page #woocommerce-wrapper div.product div.summary span.price .from,
+.single-product #page #woocommerce-wrapper div.product div.summary p.price .from {
+	font-size: 0.86806rem;
+	color: gold;
 }
 
 .single-product #page #woocommerce-wrapper div.product div.summary p.stock {
@@ -1982,14 +2013,24 @@ body[class*="woocommerce"] #page .woocommerce-ordering select {
 	margin-top: -32px;
 }
 
-.single-product #page #woocommerce-wrapper div.product div.social {
-	margin-bottom: 32px;
-}
-
 .single-product #page #woocommerce-wrapper div.product .product_meta > * {
 	display: block;
 }
 
+.single-product #page #woocommerce-wrapper div.product > .onsale {
+	left: auto;
+	right: -0.5em;
+}
+
+.single-product #page #woocommerce-wrapper div.product.sale div.summary .span.price ins,
+.single-product #page #woocommerce-wrapper div.product.sale div.summary p.price ins {
+	color: yellowgreen;
+}
+
+.single-product #page #woocommerce-wrapper div.product div.social {
+	margin-bottom: 32px;
+}
+
 .single-product #page #woocommerce-wrapper div.product .up-sells > h2 {
 	font-size: 1.8rem;
 }
@@ -2143,3 +2184,12 @@ body[class*="woocommerce"] #page .widget_price_filter .price_slider_wrapper .ui-
 		margin-left: auto;
 	}
 }
+
+@media only screen and (min-width: 560px) {
+	body[class*="woocommerce"] #page .main-navigation > div:not(:last-of-type) {
+		margin-left: 0;
+	}
+	body[class*="woocommerce"] #page .main-navigation > div:last-of-type {
+		margin-right: 16px;
+	}
+}

+ 80 - 26
alves/style-woocommerce.css

@@ -832,7 +832,7 @@ body[class*="woocommerce"] #page .main-navigation #toggle-cart {
 }
 
 body[class*="woocommerce"] #page .main-navigation #toggle-cart .svg-icon {
-	vertical-align: text-top;
+	vertical-align: middle;
 }
 
 body[class*="woocommerce"] #page .main-navigation #woocommerce-toggle:checked ~ div {
@@ -853,22 +853,11 @@ body[class*="woocommerce"] #page .main-navigation #woocommerce-toggle:checked +
 	display: inline;
 }
 
-@media only screen and (min-width: 560px) {
-	body[class*="woocommerce"] #page .main-navigation > div:not(:last-of-type) {
-		margin-right: 32px;
-	}
-	body[class*="woocommerce"] #page .main-navigation #toggle-cart {
-		display: none;
-	}
-}
-
 @media only screen and (max-width: 559px) {
 	body[class*="woocommerce"] #page .main-navigation .woocommerce-menu-container {
 		background-color: #3E7D98;
 		color: #ffffff;
-		padding-top: 16px;
-		padding-left: 16px;
-		padding-right: 16px;
+		padding: 0;
 		width: 100%;
 	}
 	body[class*="woocommerce"] #page .main-navigation .woocommerce-menu-container a,
@@ -878,6 +867,15 @@ body[class*="woocommerce"] #page .main-navigation #woocommerce-toggle:checked +
 	}
 }
 
+@media only screen and (min-width: 560px) {
+	body[class*="woocommerce"] #page .main-navigation > div:not(:last-of-type) {
+		margin-right: 32px;
+	}
+	body[class*="woocommerce"] #page .main-navigation #toggle-cart {
+		display: none;
+	}
+}
+
 body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-link {
 	display: none;
 	text-decoration: none;
@@ -901,7 +899,7 @@ body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-link .svg-ic
 	float: left;
 	height: 1.04167rem;
 	width: 1.04167rem;
-	vertical-align: top;
+	vertical-align: middle;
 }
 
 @media only screen and (min-width: 560px) {
@@ -914,7 +912,7 @@ body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget {
 	background-color: #3E7D98;
 	color: #ffffff;
 	max-width: 100%;
-	padding: 0;
+	padding: 16px 0;
 }
 
 @media only screen and (min-width: 560px) {
@@ -932,6 +930,11 @@ body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .wooc
 	border-top: 1px solid #ffffff;
 }
 
+body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .woocommerce.widget_shopping_cart .cart_list a:hover,
+body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .woocommerce.widget_shopping_cart .cart_list a:focus {
+	background-color: transparent;
+}
+
 body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .woocommerce.widget_shopping_cart .cart_list a.remove:hover,
 body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget .woocommerce.widget_shopping_cart .cart_list a.remove:focus {
 	text-decoration: none;
@@ -1855,7 +1858,7 @@ body[class*="woocommerce"] #page .woocommerce-invalid #terms {
  * Account page
  */
 body[class*="woocommerce"] #page .entry-content .woocommerce-MyAccount-navigation {
-	width: 20%;
+	width: 100%;
 }
 
 body[class*="woocommerce"] #page .entry-content .woocommerce-MyAccount-navigation ul li a {
@@ -1867,8 +1870,14 @@ body[class*="woocommerce"] #page .entry-content .woocommerce-MyAccount-navigatio
 	margin-top: 0;
 }
 
+@media only screen and (min-width: 640px) {
+	body[class*="woocommerce"] #page .entry-content .woocommerce-MyAccount-navigation {
+		width: 20%;
+	}
+}
+
 body[class*="woocommerce"] #page .woocommerce-MyAccount-content {
-	width: calc(80% - 16px);
+	width: 100%;
 }
 
 body[class*="woocommerce"] #page .woocommerce-MyAccount-content .woocommerce-notices-wrapper:empty {
@@ -1881,6 +1890,12 @@ body[class*="woocommerce"] #page .woocommerce-MyAccount-content fieldset {
 	border-radius: 3px;
 }
 
+@media only screen and (min-width: 640px) {
+	body[class*="woocommerce"] #page .woocommerce-MyAccount-content {
+		width: calc(80% - 16px);
+	}
+}
+
 body[class*="woocommerce"] #page .addresses .title h3 {
 	font-size: 1.25rem;
 }
@@ -1922,11 +1937,6 @@ body[class*="woocommerce"] #page .woocommerce-ordering select {
 /**
  * Single Product Page
  */
-.single-product #page #woocommerce-wrapper div.product > .onsale {
-	right: auto;
-	left: -0.5em;
-}
-
 .single-product #page #woocommerce-wrapper div.product div.images {
 	margin-bottom: 32px;
 }
@@ -1964,6 +1974,27 @@ body[class*="woocommerce"] #page .woocommerce-ordering select {
 .single-product #page #woocommerce-wrapper div.product div.summary p.price {
 	color: #253136;
 	font-size: 2.16rem;
+	line-height: 1.125;
+}
+
+.single-product #page #woocommerce-wrapper div.product div.summary span.price del,
+.single-product #page #woocommerce-wrapper div.product div.summary p.price del {
+	color: currentColor;
+	opacity: 0.5;
+	display: inline-block;
+}
+
+.single-product #page #woocommerce-wrapper div.product div.summary span.price ins,
+.single-product #page #woocommerce-wrapper div.product div.summary p.price ins {
+	background: none;
+	font-weight: 700;
+	display: inline-block;
+}
+
+.single-product #page #woocommerce-wrapper div.product div.summary span.price .from,
+.single-product #page #woocommerce-wrapper div.product div.summary p.price .from {
+	font-size: 0.86806rem;
+	color: gold;
 }
 
 .single-product #page #woocommerce-wrapper div.product div.summary p.stock {
@@ -1982,14 +2013,24 @@ body[class*="woocommerce"] #page .woocommerce-ordering select {
 	margin-top: -32px;
 }
 
-.single-product #page #woocommerce-wrapper div.product div.social {
-	margin-bottom: 32px;
-}
-
 .single-product #page #woocommerce-wrapper div.product .product_meta > * {
 	display: block;
 }
 
+.single-product #page #woocommerce-wrapper div.product > .onsale {
+	right: auto;
+	left: -0.5em;
+}
+
+.single-product #page #woocommerce-wrapper div.product.sale div.summary .span.price ins,
+.single-product #page #woocommerce-wrapper div.product.sale div.summary p.price ins {
+	color: yellowgreen;
+}
+
+.single-product #page #woocommerce-wrapper div.product div.social {
+	margin-bottom: 32px;
+}
+
 .single-product #page #woocommerce-wrapper div.product .up-sells > h2 {
 	font-size: 1.8rem;
 }
@@ -2143,3 +2184,16 @@ body[class*="woocommerce"] #page .widget_price_filter .price_slider_wrapper .ui-
 		margin-right: auto;
 	}
 }
+
+@media only screen and (min-width: 560px) {
+	body[class*="woocommerce"] #page .main-navigation > div:not(:last-of-type) {
+		margin-right: 0;
+	}
+	body[class*="woocommerce"] #page .main-navigation > div:last-of-type {
+		margin-left: 16px;
+	}
+}
+
+body[class*="woocommerce"] #page .main-navigation .woocommerce-cart-widget {
+	padding: 16px;
+}

+ 100 - 77
alves/style.css

@@ -188,6 +188,84 @@ $grid-configuration: map-extend($grid-configuration-default, $grid-configuration
  * Base
  * - Reset the browser
  */
+/**
+ * Button Placeholder style
+ * - Since buttons appear in various blocks,
+ *   let’s use a placeholder to keep them all
+ *   in-sync
+ */
+button,
+.button,
+input[type="submit"],
+.wp-block-button__link,
+.wp-block-file__button, .a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept {
+	line-height: 1;
+	color: #ffffff;
+	cursor: pointer;
+	font-weight: bold;
+	font-family: "Karla", Arial, sans-serif;
+	font-family: var(--font-base, "Karla", Arial, sans-serif);
+	font-size: 1.04167rem;
+	background-color: #3E7D98;
+	border-radius: 160px;
+	border-width: 0;
+	padding: 16px 48px;
+}
+
+button:before,
+.button:before,
+input[type="submit"]:before,
+.wp-block-button__link:before,
+.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before, button:after,
+.button:after,
+input[type="submit"]:after,
+.wp-block-button__link:after,
+.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
+	content: '';
+	display: block;
+	height: 0;
+	width: 0;
+}
+
+button:before,
+.button:before,
+input[type="submit"]:before,
+.wp-block-button__link:before,
+.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before {
+	margin-bottom: -0.12em;
+}
+
+button:after,
+.button:after,
+input[type="submit"]:after,
+.wp-block-button__link:after,
+.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
+	margin-top: -0.11em;
+}
+
+button:hover,
+.button:hover,
+input:hover[type="submit"],
+.wp-block-button__link:hover,
+.wp-block-file__button:hover, .a8c-posts-list__view-all:hover, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:hover, button:focus,
+.button:focus,
+input:focus[type="submit"],
+.wp-block-button__link:focus,
+.wp-block-file__button:focus, .a8c-posts-list__view-all:focus, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:focus, button.has-focus,
+.has-focus.button,
+input.has-focus[type="submit"],
+.has-focus.wp-block-button__link,
+.has-focus.wp-block-file__button, .has-focus.a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.has-focus.accept {
+	color: #ffffff;
+	background-color: #2f5f74;
+}
+
+/**
+ * Onsale Placeholder style
+ * - Since buttons appear in various blocks,
+ *   let’s use a placeholder to keep them all
+ *   in-sync
+ */
 /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
 /* Document
    ========================================================================== */
@@ -859,7 +937,8 @@ footer {
 .post-thumbnail > *,
 .page-content > *,
 .comment-content > *,
-.author-bio > * {
+.author-bio > *,
+.widget-area > .widget > * {
 	margin-top: 16px;
 	margin-bottom: 16px;
 }
@@ -869,7 +948,8 @@ footer {
 .post-thumbnail > *:first-child,
 .page-content > *:first-child,
 .comment-content > *:first-child,
-.author-bio > *:first-child {
+.author-bio > *:first-child,
+.widget-area > .widget > *:first-child {
 	margin-top: 0;
 }
 
@@ -878,7 +958,8 @@ footer {
 .post-thumbnail > *:last-child,
 .page-content > *:last-child,
 .comment-content > *:last-child,
-.author-bio > *:last-child {
+.author-bio > *:last-child,
+.widget-area > .widget > *:last-child {
 	margin-bottom: 0;
 }
 
@@ -1069,77 +1150,8 @@ object {
 }
 
 /**
- * Placeholder button style
- * - Since buttons appear in various blocks,
- *   let’s use a placeholder to keep them all
- *   in-sync
+ * Button
  */
-button,
-.button,
-input[type="submit"],
-.wp-block-button__link,
-.wp-block-file__button, .a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept {
-	line-height: 1;
-	color: #ffffff;
-	cursor: pointer;
-	font-weight: bold;
-	font-family: "Karla", Arial, sans-serif;
-	font-family: var(--font-base, "Karla", Arial, sans-serif);
-	font-size: 1.04167rem;
-	background-color: #3E7D98;
-	border-radius: 160px;
-	border-width: 0;
-	padding: 16px 48px;
-}
-
-button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
-.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
-.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
-	content: '';
-	display: block;
-	height: 0;
-	width: 0;
-}
-
-button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
-.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before {
-	margin-bottom: -0.12em;
-}
-
-button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
-.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
-	margin-top: -0.11em;
-}
-
-button:hover,
-.button:hover,
-input:hover[type="submit"],
-.wp-block-button__link:hover,
-.wp-block-file__button:hover, .a8c-posts-list__view-all:hover, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:hover, button:focus,
-.button:focus,
-input:focus[type="submit"],
-.wp-block-button__link:focus,
-.wp-block-file__button:focus, .a8c-posts-list__view-all:focus, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:focus, button.has-focus,
-.has-focus.button,
-input.has-focus[type="submit"],
-.has-focus.wp-block-button__link,
-.has-focus.wp-block-file__button, .has-focus.a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.has-focus.accept {
-	color: #ffffff;
-	background-color: #2f5f74;
-}
-
 /**
  * Block Options
  */
@@ -2422,7 +2434,7 @@ body:not(.fse-enabled) .site-description {
 	margin: 0;
 }
 
-.main-navigation #toggle:checked ~ div {
+.main-navigation #toggle:checked ~ div:not(.woocommerce-menu-container) {
 	display: block;
 }
 
@@ -2446,7 +2458,7 @@ body:not(.fse-enabled) .site-description {
 
 @media only screen and (min-width: 560px) {
 	.main-navigation > div {
-		display: block;
+		display: inline-block;
 	}
 	.main-navigation #toggle-menu {
 		display: none;
@@ -2832,6 +2844,13 @@ body:not(.fse-enabled) .footer-menu a {
 .entry-content .more-link {
 	display: block;
 	color: inherit;
+	margin-top: 16px;
+}
+
+@media only screen and (min-width: 560px) {
+	.entry-content .more-link {
+		margin-top: 32px;
+	}
 }
 
 .entry-content .more-link:after {
@@ -3827,8 +3846,13 @@ blockquote p {
 	}
 	.site-header .main-navigation {
 		align-self: center;
-		justify-self: flex-end;
+		display: flex;
+		justify-content: flex-end;
 		grid-area: main-navigation;
+		flex-wrap: wrap;
+	}
+	.site-header .main-navigation > div {
+		justify-content: flex-end;
 	}
 	.site-header .main-navigation > div > ul {
 		justify-content: flex-end;
@@ -3900,7 +3924,6 @@ blockquote p {
 	text-align: left;
 }
 
-.main-navigation > div > ul,
 .pagination .nav-links {
 	justify-content: center;
 }