summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hackeriet_logo.pngbin0 -> 4813 bytes
-rw-r--r--hacklabxl.css5
-rw-r--r--index.html27
3 files changed, 30 insertions, 2 deletions
diff --git a/hackeriet_logo.png b/hackeriet_logo.png
new file mode 100644
index 0000000..437a429
--- /dev/null
+++ b/hackeriet_logo.png
Binary files differ
diff --git a/hacklabxl.css b/hacklabxl.css
index d5f3dab..e0361af 100644
--- a/hacklabxl.css
+++ b/hacklabxl.css
@@ -1,5 +1,10 @@
.container {
+<<<<<<< HEAD
column-count: 6;
+=======
+ column-count: 6;
+ column-width: 160px;
+>>>>>>> 0fa5e397b1737adc1bf34fb36951e1f7526c11bb
column-fill: auto;
column-rule: dotted 1px black;
height: 95vh;
diff --git a/index.html b/index.html
index b496a51..89f624f 100644
--- a/index.html
+++ b/index.html
@@ -98,17 +98,40 @@
</div>
plenty of DIY pvc foghorn designs online
</div>
+<div id=recipes>
+<ul>
+<li>cacik (yoghurt,cucumber,garlic,salt)
+<li>camomille/anis/miel aux fleurs
+<li>the jasmin - gingembre
+<li>pain (yeast,warm water ; flour; bake in 'dutch oven')
+<li>frites sauce aioli crevettes royales
+<li>soupe au cresson
+<li>poireaux sauce romesco
+<li>soupe cornichons (aka. augurkova)
+<li>chopska salata
+<li>borstsch 
+</ul>
+</div>
+
+</div>
<div id=machines>
<img src="scuderi2.gif" class="fhri" alt="">
- <p><img src="Adler-30-1-Long-Arm-Industrial-Sewing-Machine-Leather.jpg" class="fhri" alt=""> adler 30-1 <img class="fhri" src="Adler-30-1-Long-Arm-Industrial-Sewing-Machine-Leather.jpg" alt=""> / ECM espresso / 26foot sailboat / BW-laserprinter /
+ <p>
+ <img src="./Adler-30-1-Long-Arm-Industrial-Sewing-Machine-Leather.jpg" class="fhri" alt="">
+ adler 30-1
+ / ECM espresso / 26foot sailboat / BW-laserprinter /
wood- metalworkshop / arc-tig welder / oscilloscope / rapid100 /
-
+
</div>
+
<div class="bouche">OGORKOWA</div>
+<p>
+<img src="hackeriet_logo.png" class="fhri" alt="">
+</p>
</section>
</body>
</html>