⏫ Forwardport of #13026 to 2.3-develop branch

magento-engcom-team · magento-engcom-team · commit b098dbc4e53e · 2018-01-24T12:16:20.000-06:00
Applied pull request patch https://github.com/magento/magento2/pull/13026.patch (created by @sanjay-wagento) based on commit(s): 1. 023fb1a 2. 7727086 Fixed GitHub Issues in 2.3-develop branch: - #12601: A space between the category page and the main footer when applying specific settings (reported by @wd7080)
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
@@ -497,6 +497,16 @@
         }
     }
 
+    //
+    //  Category page 1 column layout
+    //  ---------------------------------------------
+
+    .catalog-category-view.page-layout-1column {
+        .column.main {
+            min-height: inherit;
+        }
+    }
+
 }
 
 //
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -566,6 +566,16 @@
             }
         }
     }
+
+    //
+    //  Category page 1 column layout
+    //  ---------------------------------------------
+
+    .catalog-category-view.page-layout-1column {
+        .column.main {
+            min-height: inherit;
+        }
+    }
 }
 
 //

Original file line number	Diff line number	Diff line change
`@@ -497,6 +497,16 @@`
`497`	`497`	`}`
`498`	`498`	`}`
`499`	`499`
	`500`	`+ //`
	`501`	`+ // Category page 1 column layout`
	`502`	`+ // ---------------------------------------------`
	`503`	`+`
	`504`	`+ .catalog-category-view.page-layout-1column {`
	`505`	`+ .column.main {`
	`506`	`+ min-height: inherit;`
	`507`	`+ }`
	`508`	`+ }`
	`509`	`+`
`500`	`510`	`}`
`501`	`511`
`502`	`512`	`//`
Original file line number	Diff line number	Diff line change
`@@ -566,6 +566,16 @@`
`566`	`566`	`}`
`567`	`567`	`}`
`568`	`568`	`}`
	`569`	`+`
	`570`	`+ //`
	`571`	`+ // Category page 1 column layout`
	`572`	`+ // ---------------------------------------------`
	`573`	`+`
	`574`	`+ .catalog-category-view.page-layout-1column {`
	`575`	`+ .column.main {`
	`576`	`+ min-height: inherit;`
	`577`	`+ }`
	`578`	`+ }`
`569`	`579`	`}`
`570`	`580`
`571`	`581`	`//`