0.4.5: tradefurniturecompany/site#189

tradefurniturecompany · Oct 29, 2020 · b213c44 · b213c44
1 parent b3accbe
commit b213c44
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "tradefurniturecompany/core"
-	,"version": "0.4.4"
+	,"version": "0.4.5"
 	,"description": "A custom module for tradefurniturecompany.co.uk (Magento 2)"
 	,"type": "magento2-module"
 	,"homepage": "https://github.com/tradefurniturecompany/core"
@@ -11,7 +11,7 @@
 		,"homepage": "https://mage2.pro/users/dmitry_fedyuk"
 		,"role": "Developer"
 	}]
-	,"require": {"mage2pro/core": ">=7.0.3"}
+	,"require": {"mage2pro/core": ">=7.0.4"}
 	,"autoload": {"files": ["registration.php"], "psr-4": {"TFC\\Core\\": ""}}
 	,"keywords": ["Magento 2"]
 }
diff --git a/view/frontend/web/_category.less b/view/frontend/web/_category.less
@@ -54,27 +54,33 @@ body.catalog-category-view #maincontent {
 							&:hover, &.active {padding: 0; border-width: 2px !important;}
 						}
 						> .details {
-							> .price-box.price-final_price {
-								min-height: auto;
-								@media (max-width: 639px) {margin: 0;}
+							> .price-and-wishlist {
+								overflow: hidden; width: 100%;
+								> .price-box.price-final_price {
+									float: left; margin: 0; min-height: auto;
+									//@media (max-width: 639px) {margin: 0;}
+								}
+								> .actions-secondary-container {float: right; padding-right: 0.25rem;}
 							}
-							> .name {@media (max-width: 639px) {margin: 0;}}
-							.product-item-link {
-								height: auto;
-								@media (max-width: 639px) {font-size: 1.33rem;}
+							> .name {
+								margin-top: 0; @media (max-width: 639px) {margin-bottom: 0;}
+								> .product-item-link {
+									height: auto;
+									@media (max-width: 639px) {font-size: 1.33rem;}
+								}
 							}
-						}
-						.product-item-actions {
-							// 2020-10-24
-							// "Remove the «Add to Wishlist» and «Add to Backet» controls
-							// from the frontend category page on narrow screens":
-							// https://github.com/tradefurniturecompany/site/issues/193
-							@media (max-width: 639px) {display: none;}
-							@media (min-width: 640px) {
-								margin-bottom: 0;
-								> .actions-primary {position: absolute; top: -200px;}
+							.product-item-actions {
+								// 2020-10-24
+								// "Remove the «Add to Wishlist» and «Add to Backet» controls
+								// from the frontend category page on narrow screens":
+								// https://github.com/tradefurniturecompany/site/issues/193
+								@media (max-width: 639px) {display: none;}
+								@media (min-width: 640px) {
+									margin: 0;
+									> .actions-primary {position: absolute; top: -200px;}
+								}
+								> .actions-secondary > .action {line-height: initial; width: auto;}
 							}
-							> .actions-secondary > .action {width: auto;}
 						}
 					}
 				}

diff --git a/view/frontend/web/_menu.less b/view/frontend/web/_menu.less
@@ -3,7 +3,7 @@
 	margin-bottom: 0 !important;
 	@media (min-width: 768px) {.ammenu-menu-wrapper.-desktop .ammenu-item.-main {
 		padding: 1rem 1.5rem;
-		// 2020-10-29 Dmitry Fedyuk https://www.upwork.com/fl/mage2pro
+		// 2020-10-30 Dmitry Fedyuk https://www.upwork.com/fl/mage2pro
 		// "Improve the main menu": https://github.com/tradefurniturecompany/site/issues/203
 		> .ammenu-submenu-container {
 			margin-top: 10px; padding: 0;