Merge branch 'master' of https://git.xpub.nl/alicestrt/magiun_website into HEAD

src/components/SecondEditionPage.vue

@@ -20,9 +20,9 @@ body {
 }
 
 #magi {
-  width: 40%;
+  width: 50%;
   z-index: -1;
-  padding: 20px;
+  /*padding: 20px;*/
   --color-stop: #fff5f5;
   --color-bot: #333042;
 }
@@ -32,11 +32,11 @@ body {
 }
 
 #mag_title {
-  font-size: 450%;
+  font-size: 500%;
   /*color: #ffcccc;*/
   color: #1B75BC;
   font-family: 'Work Sans', sans-serif;
-  text-align: center;
+  text-align: left;
   z-index: 1;
   padding: 6px;
 
@@ -79,7 +79,7 @@ body {
   font-size: 100%;
   text-align: center;
   border: 8px dotted #1B75BC;
-  padding: 5px;
+  padding: 12px;
 }
 
 a {
@@ -92,18 +92,18 @@ a {
 
 #edition {
   color: #1B75BC;
-  font-family: 'Happy Times';
+  font-size: 18px;
-  margin-top: 55px;
+  font-family: 'Work Sans';
-
+  letter-spacing: 1px;
-
+  /*margin-top: 55px;*/
 }
 
 @media (max-width: 1217px) {
   #mag_title {
-    font-size: 300%;
+    font-size: 500%;
     padding-top: 10px;
-    padding-left: 12px;
+    /*padding-left: 12px;*/
-    padding-right: 12px;
+    /*padding-right: 12px;*/
   }
   #mag_subtitle {
     font-size: 150%;
@@ -234,7 +234,7 @@ a {
 <br>
   <p class="item"><a href="/phone">CHRISTMAS DINNER</a><br>Valentina Vella</p>
   <br>
-  <p class="item"><a href="/whatwecan">WE DO WHAT WE CAN WITH WHAT WE HAVE</a><br>Raluca Chereji</p>
+  <p class="item"><a href="/whatwecan">WE DO WHAT WE CAN<br> WITH WHAT WE HAVE</a><br>Raluca Chereji</p>
   <br>
   <p class="item"><a href="/lychee">HAVE YOU EATEN YET?</a><br>Witold van Ratingen</p>
   <br>

src/components/anise.vue

@@ -5,6 +5,22 @@
   font-family: 'Happy Times';
   src: url('../../fonts/happy-times-NG_regular_master.otf');
 }
+@font-face {
+  font-family: 'Semi Light Dots';
+  src: url('../../fonts/AC1-SemiLightDots.otf');
+}
+@font-face {
+  font-family: 'Monospaced Dots';
+  src: url('../../fonts/AC1-Monospaced.otf');
+}
+@font-face {
+  font-family: 'Bold Big Dots';
+  src: url('../../fonts/AC1-BoldBigDots.otf');
+}
+@font-face {
+  font-family: 'ED Regular';
+  src: url('../../fonts/ED-Regular.otf');
+}
 * {
     border: 0px black solid;
     background-color: white;
@@ -31,12 +47,13 @@ a {
 }
 
 .content {
-  padding-right: 50px;
+  /*padding-right: 50px;*/
+  /*padding-left: 60px;*/
   padding-top: 40px;
   font-family: 'Happy Times';
-  font-size: 15px;
+  font-size: 18px;
+  line-height: 24px;
   padding-bottom: 40px;
-  padding-left: 60px;
   color: #1B75BC;
   text-align: left;
 
@@ -46,9 +63,18 @@ a {
   margin-top: 60px;
 }
 
+.arrows {
+  font-size: 80px;
+  font-family: 'Semi Light Dots', sans-serif;
+  padding-top: 20px;
+  color: #FA00FF;
+  vertical-align: top;
+  text-align: center;
+}
+
 .title_story {
   font-size: 80px;
-  font-family: 'Work Sans', sans-serif;
+  font-family: 'Semi Light Dots', sans-serif;
   padding-top: 20px;
   color: #FA00FF;
   text-align: center;
@@ -61,7 +87,7 @@ a {
 
 .author {
   font-size: 20px;
-  font-family: 'Poppins', sans-serif;;
+  font-family: 'ED Regular', sans-serif;;
   text-align: center;
   color: #FA00FF;
 }
@@ -80,7 +106,7 @@ a {
   padding-top: 20px;
   margin-top: 20px;
   font-size: 15px;
-  font-family: 'Roboto Mono', monospace;
+  font-family: 'Monospaced Dots', monospace;
   border: 3px dotted #FA00FF;
   margin-bottom: 30px;
 }
@@ -91,11 +117,15 @@ a {
 }
 
 .recipe_title {
+  font-family: 'Bold Big Dots', monospace;
+  font-size: 200%;
   padding-bottom: 20px;
+  z-index: 10;
 }
 
 .recipe {
   margin-top: 20px;
+  font-weight: bold;
 }
 
 @media (max-width: 575px){
@@ -119,10 +149,10 @@ a {
 
     <b-row>
       <b-col md="2" class="controls">
-        <p>xxxxxxxxxxx</p>
+        <p class="arrows">←</p>
       </b-col>
       <b-col md="2" offset-md="8" class="controls">
-        <p>xxxxxxxxxxx</p>
+        <p class='arrows'>→</p>
       </b-col>
     </b-row>
 
@@ -131,7 +161,7 @@ a {
         <b-row>
           <b-col md="10" offset-md="3">
         <div class="zoom">
-          <b-img center class="img-fluid" alt="Responsive image" src="media/magiun2/lychee.png"> </b-img>
+          <b-img center class="img-fluid" alt="Responsive image" src="media/magiun2/anise.png"> </b-img>
         </div>
       </b-col>
       </b-row>
@@ -150,14 +180,18 @@ a {
         <b-col md="5">
 <div class='content'>
 
-<p>The majority of my cooking consists of throwing together whatever's in my fridge and cupboards. And, gladly, what I've grown or surprisingly harvested from the yard that came with my new apartment!*
+<p>The majority of my cooking consists of throwing together whatever's in my fridge and cupboards. And, gladly, what I've grown or surprisingly harvested from the yard that came with my new apartment!
-The last years, but even more so these months, I rarely shop for precise ingredients to make a specific dish.**
+</p>
-If I have guests over for dinner, I tend to make more of an effort, and I sometimes regret not making such an effort for myself. With a handful (or two) of exceptions, I have spent this past year cooking and eating solo.***
+* The last years, but even more so these months, I rarely shop for precise ingredients to make a specific dish.</p>
-I don't mean to make that sound sadder than it is, it is how it is, but I do miss having friends over and eating together...****</p>
-<p>EXCEPTIONS TO ADAPTATIONS THAT ARE STILL ADAPTATIONS</p>
 <p>
-
+** If I have guests over for dinner, I tend to make more of an effort, and I sometimes regret not making such an effort for myself. With a handful (or two) of exceptions, I have spent this past year cooking and eating solo.</p>
-Like most people, the way I cook (and shop) has changed. It's more sparse, probably a bit boring, and at the same time more creative as I replace ingredients with what I have. Getting a "want/need/crave" item around meal times is no longer part of my life. In the beginning of the pandemic, I was that woman retreating, jumping back or even running away when people approached. The woman who snapped at people, and had to calm down in the quietest part of the store (if you're in need, try the dietary restriction or health food section). For a couple months, I only went to one store, close by, where I knew where everything was, so I could go in and out as fast as I could. A friend jokingly called me an old lady, I call it taking care of my mental health. I soon began shopping in the morning when it's more quiet (yep, right after granny hour), and almost a year later I still don't go around peak hours. I don't plan meals, I just grab a variety of fruit and veggies for up to a week, and add tofu, seitan, tempeh, lentils and beans, sometimes a fun (though generally low in protein) burger or an add-water-nut-burger-mix. The downside is that my meals could use a bit more spice and spunk, the upside is that I buy and eat way less candy, chocolate, cookies, chips and dessert-type things that lure your low glucose levels in the rush toward dinner time. </p>
+<p>
+*** I don't mean to make that sound sadder than it is, it is how it is, but I do miss having friends over and eating together...
+</p>
+<p>
+**** EXCEPTIONS TO ADAPTATIONS THAT ARE STILL ADAPTATIONS
+</p>
+<p> Like most people, the way I cook (and shop) has changed. It's more sparse, probably a bit boring, and at the same time more creative as I replace ingredients with what I have. Getting a "want/need/crave" item around meal times is no longer part of my life. In the beginning of the pandemic, I was that woman retreating, jumping back or even running away when people approached. The woman who snapped at people, and had to calm down in the quietest part of the store (if you're in need, try the dietary restriction or health food section). For a couple months, I only went to one store, close by, where I knew where everything was, so I could go in and out as fast as I could. A friend jokingly called me an old lady, I call it taking care of my mental health. I soon began shopping in the morning when it's more quiet (yep, right after granny hour), and almost a year later I still don't go around peak hours. I don't plan meals, I just grab a variety of fruit and veggies for up to a week, and add tofu, seitan, tempeh, lentils and beans, sometimes a fun (though generally low in protein) burger or an add-water-nut-burger-mix. The downside is that my meals could use a bit more spice and spunk, the upside is that I buy and eat way less candy, chocolate, cookies, chips and dessert-type things that lure your low glucose levels in the rush toward dinner time. </p>
 <p>With baking, it usually starts something like this:
 	I have a couple overripe bananas that have been sitting there for a few days, so I make banana bread (which I bring on my bike rides). I adapt the recipe with peanut butter, nuts, cocoa powder, raisins, dates, whatever I have and feel like adding.
 	Or a friend sends me a message that she's eating chocolate with green tea flavor. This leaves me craving ginger flavored chocolate, but the buying of ingredients will have to wait until the less crowded morning. Super fun to make though! See details below.
@@ -180,13 +214,13 @@ Like most people, the way I cook (and shop) has changed. It's more sparse, proba
 <b-col md="4" offset-md="2" class="recipe_block">
 <b-row>
   <b-col>
+      <p class="recipe_title">  POUR YOURSELF <br> A <br> QUARANTINI</p>
+  </b-col>
+<b-col>
     <div class="image_container">
       <b-img class="img-fluid" id="anisecup" src="media/magiun2/anise_cup.jpeg"> </b-img>
     </div>
 </b-col>
-<b-col>
-  <p id="recipe_title">  POUR YOURSELF A QUARANTINI</p>
-</b-col>
 </b-row>
 <b-row>
   <b-col>
@@ -209,7 +243,7 @@ My family has a wide range of likes and dislikes and I kept this in mind too muc
 <b-col md="4" offset-md="1" class="recipe_block">
   <b-row>
     <b-col>
-      <p>CHOCOLATE COVERED ANYTHING</p>
+      <p class="recipe_title">CHOCOLATE COVERED <br>A N Y T H I N G</p>
 
     </b-col>
   </b-row>
@@ -224,10 +258,12 @@ My family has a wide range of likes and dislikes and I kept this in mind too muc
 
 <p>
     Ingredients<br>
-    One 100g bar of dark chocolate (72-85%)		 <br>
+    - One 100g bar of dark chocolate (72-85%)		 <br>
-    About 150g of cut up pieces of dried fruit		<br>
+    - About 150g of cut up pieces of dried fruit		<br>
 </p>
-<p>Adaptation <br> 75g <br> 100g of anything that tastes great with chocolate!</p>
+<p>Adaptation <br>
+    - 75g <br> 
+    - 100g of anything that tastes great with chocolate!</p>
 <p>
     Needed: small wooden spoon, chopsticks.</p>
     <p>
@@ -236,9 +272,6 @@ My family has a wide range of likes and dislikes and I kept this in mind too muc
     <p>
 
     Place a small, sturdy ceramic bowl inside a pan with water. Use the burner that's closest to your working area. Bring to a boil and let it simmer low. Break the chocolate into pieces and add to the bowl. Stir with a small wooden spoon until it's all evenly melted.</p>
-
-      <br><br>
-
 <p>
     Throw a couple pieces of fruit/nuts into the chocolate and make sure they're fully covered. Use chopsticks to retrieve them, let the excess drip back into the bowl. Lay the candy on the baking sheet, leave a bit of space in between. If you have any chocolate left at the end, you can drip it in a fun shape. When you're all done, place the sheet in the fridge for about 30min or until hard.</p>
   </div>

src/components/knife.vue

@@ -5,6 +5,11 @@
   font-family: 'Happy Times';
   src: url('../../fonts/happy-times-NG_regular_master.otf');
 }
+@font-face {
+  font-family: 'SemiLightDots';
+  src: url('../../fonts/AC1-SemiLightDots.otf');
+}
+
 * {
     border: 0px black solid;
     background-color: white;
@@ -47,7 +52,7 @@ a {
 
 .title_story {
   font-size: 80px;
-  font-family: 'Work Sans', sans-serif;
+  font-family: 'SemiLightDots', sans-serif;
   padding-top: 20px;
   color: #FA00FF;
   text-align: center;