Text edits + layout fixes.

evoluteur · Jun 27, 2019 · a8fb783 · a8fb783
1 parent a1096eb
commit a8fb783
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 38 deletions.
diff --git a/css/madeleinology.css b/css/madeleinology.css
@@ -36,6 +36,11 @@ a:hover{
 }
 h1{
   margin-bottom: 50px;
+  font-size: 1.8em;
+}
+h2{
+  font-size: 1.2em;
+
 }
 
 .m-sides,
@@ -376,8 +381,22 @@ div:hover > .xtra{
   background-color: #337ab7;
 }
 
+#neigepix{
+  height: 0;
+  margin: 5px 0;
+  background: #ccc;
+  -webkit-transition: all .3s linear 0s;
+  transition: all .3s linear 0s;
+}
 
+#neigepanel.on {
+  height: 438px;
+}
 
+#neigepix,
+#neigepix > img{
+  width: 694px;
+}
 
 .clearer{
   height: 1px;

diff --git a/index.html b/index.html
@@ -8,7 +8,7 @@
     <link rel="icon" type="image/png" href="favicon.png" />
 	<link href="css/madeleinology.css" rel="stylesheet" /> 
 
-	<meta name="keywords" content="madeleine cake recipe data science food study" />
+	<meta name="keywords" content="baking madeleine cake recipe data science food study" />
 	<meta name="description" content="Madeleinology: the study of French Madeleine cakes." />
 </head>
 
@@ -29,7 +29,7 @@
 
 <section>
 
-	<h2 class="helloworld">Madeleinology</h2>
+	<h1 class="helloworld">Madeleinology</h1>
 
      <p>If "Madeleinology" was a real world, it would mean "<strong>the study of Madeleines</strong>".  
         It is one of my hobbies. On this site I will share some of my findings about this 250 years old recipe.</p>

diff --git a/ingredients-top4-d3-radar.html b/ingredients-top4-d3-radar.html
@@ -32,8 +32,14 @@
     </ul>
 
     <section>
-        <h1>Another look for patterns in the proportions of flour, sugar, butter, and eggs in Madeleines</h1>
+        <h1>Madeleine shapes</h1>
+        <p>Beside the soft shapes of madeleine cakes, are the hard shapes of ingredient quantities.</p>
+
         <div id="radar_charts"></div>
+
+
+        <p>Even though each recipe has a unique shape, there is no isomorphism between the soft shape of the cake and the hard shape of the numbers. Am I over-analysing things again here? Will this help me find the recipe for the perfect madeleine cakes ?</p>
+
     </section>
 <script> 
     RadarChart.defaultConfig.color = function() {};

diff --git a/js/ingredients.js b/js/ingredients.js
@@ -49,5 +49,6 @@ function sort(n){
 	render();
 }
 
-render();
-
+document.addEventListener("DOMContentLoaded", function(event) { 
+  render();
+});
diff --git a/js/recipes.js b/js/recipes.js
@@ -63,5 +63,6 @@ function sort(n){
 	render();
 }
 
-render();
-
+document.addEventListener("DOMContentLoaded", function(event) { 
+  render();
+});
diff --git a/madeleine-correlation.html b/madeleine-correlation.html
@@ -13,7 +13,14 @@
 </head>
 
 <body>
-
+<script type="text/javascript">
+var ned = '0'
+function neige(){
+    var ne = document.getElementById("neigepix")
+    ned = ned === '0' ? '438px' : '0'
+    ne.style.height = ned
+}
+</script>
     <ul class="pnav">
         <li class="idx"><a href="index.html"><img class="logo"class="logo" src="m-icon.png"><span class="mq-no-sl">Madeleinology</span></a></li> 
         <li><a href="madeleines-data-science.html">Data</a></li> 
@@ -29,7 +36,7 @@
 
 <section>
 
-<h2>Madeleine search correlation</h2>
+<h1>Madeleine search correlation</h1>
 
 <div>
     <p>The Google search most correlated (r=0.96) to "<strong>madeleine cake</strong>" is "<strong>my cat loves me</strong>".  
@@ -38,6 +45,14 @@ <h2>Madeleine search correlation</h2>
 
     <p>My quest is over. <strong>A cat's love must be the secret ingredient of Madeleines</strong>!</p>
 
+    <p>It makes total sense, <a href="javascript:neige()">Neige already helped me make jam last year</a>.
+    </p>
+
+    <div >
+            <img id="neigepix" src="pix/neige-jam.jpg">
+    </div>
+
+
     <p>Explore at <a href="https://www.google.com/trends/correlate/search?e=Madeleine+cake&t=monthly&p=us" target="_blank">Google Correlate</a> but remember that <a href="https://en.wikipedia.org/wiki/Correlation_does_not_imply_causation">correlation does not imply causation</a>.</p>
 <div>
 

diff --git a/madeleine-cupcake-trend.html b/madeleine-cupcake-trend.html
@@ -29,12 +29,12 @@
 
 <section class="s-trends">
 
-    <h2>Google Trends: <span class="c-blue">Madeleine</span> Vs <span class="c-red">Cupcake</span></h2>
+    <h1>Google Trends: <span class="c-blue">Madeleine</span> Vs <span class="c-red">Cupcake</span></h1>
 
     <p>This is a look at the Google searches for "madeleine cake" versus "cupcake" from January 2001 to June 2017 (using <a href="https://trends.google.com/trends/" target="_blank">Google Trends</a>).</p>
 
     <div>
-        <strong>In the US</strong>
+        <h2>In the US</h2>
         <p>As expected, cupcakes are way more popular than madeleines in the US.</p>
         <div class="legend">
             <div class="c-blue"><div class="line"></div>Madeleine</div>
@@ -46,14 +46,14 @@ <h2>Google Trends: <span class="c-blue">Madeleine</span> Vs <span class="c-red">
     </div>
 
     <div>
-        <strong>World wide</strong>
+        <h2>World wide</h2>
         <p>World wide, madeleines used to be as popular as cupcakes but it didn't last.</p>
         <img src="pix/google-trends/madeleine-cupcake-world.gif"><br/>
         <a href="https://trends.google.com/trends/explore?q=madeleine,cupcake" target="gt">Latest Trends World wide</a> 
     </div>
 
     <div>
-        <strong>In France</strong>
+        <h2>In France</h2>
         <p>Madeleines used to be way more popular as cupcakes, but the two are now pretty close.</p>
         <img src="pix/google-trends/madeleine-cupcake-france.gif"><br/>
         <p>France seem to be divided between madeleine lovers and cupcake lovers.</p>

diff --git a/madeleines-data-science.html b/madeleines-data-science.html
@@ -8,7 +8,7 @@
     <link rel="icon" type="image/png" href="favicon.png" />
 	<link href="css/madeleinology.css" rel="stylesheet" /> 
 
-	<meta name="keywords" content="cooking dessert madeleine french butter cake data science" />
+	<meta name="keywords" content="analytics ingredients madeleine french butter cake data science" />
 </head>
 
 <body>

diff --git a/madeleines-recipe.html b/madeleines-recipe.html
@@ -8,8 +8,8 @@
     <link rel="icon" type="image/png" href="favicon.png" />
 	<link href="css/madeleinology.css" rel="stylesheet" /> 
 
-	<meta name="keywords" content="madeleine french butter cake grandmother recipe" />
-	<meta name="description" content="My Grandmother Hugette's Madeleines recipe." />
+	<meta name="keywords" content="madeleine french butter cake grandmother grandma recipe" />
+	<meta name="description" content="My Grandmother's Madeleines recipe." />
 </head>
 
 <body>
@@ -28,11 +28,11 @@
 	</ul>
 
 <section>
-<h1>Hugette's Madeleines Recipe</h1>
+<h1>My Grandmother's Madeleines Recipe</h1>
 <div class="pixShadow" style="float:right;"><img src="pix/madeleines-3styles.jpg"/></div>
 
 
-<p>This is the recipe from my Grandmother Hugette. I've tried several others but of course this one is my favorite.</p>
+<p>This is the recipe from my Grandmother. I've tried several others but of course this one is my favorite.</p>
 
 <p>Prep Time: 30 minutes<br>Cook Time: 10-15 minutes</p>
 
@@ -56,27 +56,29 @@ <h3>Ingredients for 18 madeleines</h3>
 
 <p><h3>Tools</h3> 
 <ul>
-	<li>Madeleines pan</li>
+	<li>Madeleines pan (preferably a metal one)</li>
 	<li>Sifter</li>
 </ul>
 </p>
 
 
 <p><h3>Instructions</h3> 
 <ol>
-	<li>Prepare yeast according to instructions on package</li>
+	<li>Prepare yeast according to instructions on package, or use baking powder</li>
 	<li>Pre-heat oven at 375°F</li>
 	<li>Mix soft (but not melted) butter and sugar</li>
-	<li>Add eggs and flour (using the sifter) and a pinch of salt</li>
+	<li>Beat the eggs</li>
+	<li>Slowly add the eggs and the flour (using the sifter) to the mix</li>
+	<li>Add a pinch of salt</li>
 	<li>Add the yeast or baking powder</li>
 	<li>(optional) Add the lemon zest or vanilla extract</li>
 	<li>Mix until the dough is homogeneous</li>
-	<li>Put a little melted butter on the madeleines pan (to prevent sticking)</li>
+	<li>Grease the madeleine pan w/ melted butter</li>
 	<li>Fill each slot on the madeleines pan w/ dough</li>
 	<li>(optional) Add sliced almonds and/or pine nuts on top</li>
 	<li>(optional) Add a raspberry in the center</li>
 	<li>Put in the oven for 10 to 15 minutes (until golden)</li>
-	<li>Get the madeleines tray out of the oven, and the madelines out of the tray, and let cool down</li>
+	<li>Get the madeleines tray out of the oven, and the madeleines out of the tray, and let them cool down</li>
 </ol>
 
 <p><img class="pixShadow" src="pix/madeleines-mold.jpg"/></p>
@@ -110,7 +112,7 @@ <h3>Madeleines as ingredients in other recipes</h3>
 	</ul>
 </section>
 
-<div class="copy">&copy; 2019 <a href="https://evoluteur.github.io/" rel="nofollow">Olivier Giulieri</a>.</div>
+<div class="copy">&copy; 2019 <a href="https://evoluteur.github.io/">Olivier Giulieri</a>.</div>
 
 </body>
 

diff --git a/madeleines-salty.html b/madeleines-salty.html
@@ -30,31 +30,31 @@
     <section>
         <h1>Salty Madeleines</h1>
 
-        <p>By removing the sugar and adjusting the ingredients quantities, you can also make salty madeleines. It is an opportunity to try baking in ham, cheese, and/or vegetables.</p>
+        <p>Using the same <a href="madeleines-recipe.html">madeleine recipe</a> without sugar, you can make salty madeleines. It is an opportunity to bake in some bacon, ham, cheese, and/or vegetables.</p>
 
         <div class="m-salty">
 
             <div>
-                <div>Duck Prosciutto</div>
+                <h2>Duck Prosciutto</h2>
                 <img class="pixShadow" src="pix/salty/duck-salty-madeleines.jpg"><br><br>
             </div>
             <div>
-                <div>Roquefort cheese & bacon</div>
+                <h2>Roquefort cheese & bacon</h2>
                 <img class="pixShadow" src="pix/salty/roquefort-salty-madeleines.jpg"><br><br>
             </div>
             <div>
-                <div>Zucchini & goat cheese</div>
+                <h2>Zucchini & goat cheese</h2>
                 <img class="pixShadow" src="pix/salty/goatcheese-zucchini-madeleines.jpg"><br><br>
             </div>
             <div>
-                <div>Goat cheese & thyme</div>
+                <h2>Goat cheese & thyme</h2>
                 <img class="pixShadow" src="pix/salty/goat-cheese-thyme-madeleines.jpg"><br><br>
             </div>
         </div> 
 
         <div>...and many more possibilities can be done.</div>
 
-        <p>So far, "Duck Prosciutto" is my favorite salty madeleine.</p>
+        <p><div class="heart">♥</div>&nbsp; "Duck Prosciutto" is my favorite salty madeleine... so far.</p>
 
     </section>
 

diff --git a/madeleines-sweet.html b/madeleines-sweet.html
@@ -35,43 +35,43 @@ <h1>Sweet Madeleines</h1>
 <div class="m-sides">
 
     <div>
-        <p>Plain</p>
+        <h2>Plain</h2>
         <img src="pix/sides/plain-top.jpg">
         <img src="pix/sides/plain-bottom.jpg">
      </div>
 
     <div>
-        <p>Raspberry Heart</p>
+        <h2>Raspberry Heart</h2>
         <img src="pix/sides/raspberry-top.jpg">
         <img src="pix/sides/raspberry-bottom.jpg">
      </div>
 
     <div>
-        <p>Sliced Almonds Topping</p>
+        <h2>Sliced Almonds Topping</h2>
         <img src="pix/sides/almond-top.jpg">
         <img src="pix/sides/plain-bottom.jpg">
      </div>
 
     <div>
-        <p>Pine Nuts Topping</p>
+        <h2>Pine Nuts Topping</h2>
         <img src="pix/sides/pinenut-top.jpg">
         <img src="pix/sides/plain-bottom.jpg">
      </div>
 
     <div>
-        <p>Cocoa</p>
+        <h2>Cocoa</h2>
         <img src="pix/sides/choco-top.jpg">
         <img src="pix/sides/choco-bottom.jpg">
      </div>
 
     <div>
-        <p>1/2 Cocoa</p>
+        <h2>1/2 Cocoa</h2>
         <img src="pix/sides/half-choco-top.jpg">
         <img src="pix/sides/half-choco-bottom.jpg">
     </div>
 
     <div>
-        <p>Cocoa nibs</p>
+        <h2>Cocoa nibs</h2>
         <img src="pix/sides/choco-nibs-top.jpg">
         <img src="pix/sides/choco-nibs-bottom.jpg">
     </div>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "madeleinology",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A study of Madeleines",
   "repository": {
     "type": "git",

diff --git a/pix/neige-jam.jpg b/pix/neige-jam.jpg