From 915228f62fc919a088ffc702c4e233c8377aada5 Mon Sep 17 00:00:00 2001
From: Jing <eefi@eureka>
Date: Sun, 28 Nov 2021 14:29:05 +0100
Subject: [PATCH] Revert "use float instead of flex"

This reverts commit 4b72b73bc21a628ce8408345d59357f4583c1a51.
---
 themes/cookbook/layouts/_default/baseof.print.html |  8 ++++----
 themes/cookbook/layouts/partials/printscript.html  | 10 +++++-----
 themes/cookbook/static/css/custom.css              |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/themes/cookbook/layouts/_default/baseof.print.html b/themes/cookbook/layouts/_default/baseof.print.html
index c5e26c6..bbd6fdc 100644
--- a/themes/cookbook/layouts/_default/baseof.print.html
+++ b/themes/cookbook/layouts/_default/baseof.print.html
@@ -103,13 +103,13 @@
     height: 3rem;
   }
 
-  .clear {
-    clear:both;
+  .allZutaten {
+    display: flex;
+    flex-wrap: wrap;
   }
 
   .zutatenWrapper {
-    margin: 1em;
-    float: left;
+    flex-basis: 49%;
   }
 </style>
 <div class="section">
diff --git a/themes/cookbook/layouts/partials/printscript.html b/themes/cookbook/layouts/partials/printscript.html
index 92669f1..ae4be23 100644
--- a/themes/cookbook/layouts/partials/printscript.html
+++ b/themes/cookbook/layouts/partials/printscript.html
@@ -3,7 +3,6 @@
 <script>
 window.addEventListener('load', function () {
 	const zutatenNode = document.evaluate('//*[@id="zutaten"]', document).iterateNext()
-	const zubereitungNode = document.evaluate('//*[@id="zubereitung"]', document).iterateNext()
 
 	let nodeBlocks = []
 	let nextNode = zutatenNode.nextElementSibling
@@ -17,22 +16,23 @@ window.addEventListener('load', function () {
 		nextNode = nextNode.nextElementSibling
 	}
 
-	let clearDiv = document.createElement('div')
-	clearDiv.classList.add('clear')
+	let allIngredientsDiv = document.createElement('div')
+	allIngredientsDiv.id = "allZutaten"
+	allIngredientsDiv.classList.add('allZutaten')
 	let nodeBlockIndex = 0
 	nodeBlocks.forEach(function(nodeArray) {
 		let outerDiv = document.createElement('div')
 		outerDiv.id = `wrap${nodeBlockIndex}`
 
 		outerDiv.classList.add("zutatenWrapper")
-		zutatenNode.parentNode.insertBefore(outerDiv, zubereitungNode)
+		allIngredientsDiv.appendChild(outerDiv)
 		for(elem of nodeArray) {
 			outerDiv.appendChild(elem)
 		}
 
 		nodeBlockIndex += 1
 	})
-	zutatenNode.parentNode.insertBefore(clearDiv, zubereitungNode)
+	zutatenNode.parentNode.insertBefore(allIngredientsDiv, zutatenNode.nextSibling)
 	console.log("Finished fiddling")
 })
 </script>
diff --git a/themes/cookbook/static/css/custom.css b/themes/cookbook/static/css/custom.css
index 45f3d40..b74262d 100644
--- a/themes/cookbook/static/css/custom.css
+++ b/themes/cookbook/static/css/custom.css
@@ -1,4 +1,4 @@
 li {
     padding-bottom: .5em;
     font-size: 20px;
-}
+}
\ No newline at end of file