ada/thesis.md

@@ -6,14 +6,14 @@ author: Ada
 
 # <?water bodies>
 
-<div class="h2-no-pagebreak">A narrative exploration of <br>divergent digital intimacies </div> 
+### A narrative exploration of <br>divergent digital intimacies
 
 ---
 
 > Water, stories, the body,  
 > all the things we do, are  
 > mediums  
->that hide and show what’s  
+that hide and show what’s  
 > hidden.  
 > (Rumi, 1995 translation)
 
@@ -905,11 +905,10 @@ are me.
 
 ## 2. A LIFE TO BE HAD<sup>11</sup>
 
-<div class="fake-margin-note"><sup>11 </sup> Was this the end of this story?\
+<div class="fake-margin-note"><sup>11</sup> Was this the end of this story?
 In the epilogue, you sit your body down and enter your
 computer. The air coming in from the window smells wet and
-earthy, new. The sun shines low on the horizon.\
+earthy, new. The sun shines low on the horizon.
-
 You log in to the internet and realize you are being told a story.
 You start to listen, carefully and, full of love, touch the story to
 let it know you are there. Delicate-fingered, curious like a child
@@ -968,7 +967,8 @@ eSq9p.\
 Fuck.\
 You try not to panic, but you know you have been detected.\
 
-You pack up your things: the pie I made you, a love letter, a hand made out of felt, a star, a door, a stuffed animal; and
+You pack up your things: the pie I made you, a love letter, two
+hands made out of felt, a star, a door, a stuffed animal; and
 you leave again.</div>
 
 ## THANK YOU
@@ -1040,4 +1040,4 @@ doi:10.1177/1440783313486220.
 Yun, J. (2020) ‘The Leaving Season’, in Some Are
 Always Hungry. University of Nebraska Press.
 
-<div class="h2-no-pagebreak"> &lt;/?water bodies&gt; </div>
+# &lt;/?water bodies&gt;

print/index.html

@@ -168,8 +168,12 @@ alt="Photo by Leslie Robbins" />
    	 <!--<section id="section-4" class="section">-->
    	 <section id="section-4" class="section">
        		 <h1 id="water-bodies">&lt;?water bodies&gt;</h1>
+<<<<<<< HEAD
+<h3 id="a-narrative-exploration-of-divergent-digital-intimacies">A narrative exploration of <br>divergent digital intimacies</h3>
+=======
 <h3 id="a-narrative-exploration-of-divergent-digital-intimacies">A
 narrative exploration of <br>divergent digital intimacies</h3>
+>>>>>>> 0d34f2967a266c03a36514751c02bce2519f810f
 <hr />
 <blockquote>
 <p>Water, stories, the body,<br />
@@ -921,14 +925,12 @@ desperately. It has to exist and yet it can’t for long.</p>
 because I love you, little digital body and you are me.</p>
 <h2 id="a-life-to-be-had11">2. A LIFE TO BE HAD<sup>11</sup></h2>
 <div class="fake-margin-note">
-<p><sup>11 </sup> Was this the end of this story?<br />
+<p><sup>11</sup> Was this the end of this story? In the epilogue, you
-In the epilogue, you sit your body down and enter your computer. The air
+sit your body down and enter your computer. The air coming in from the
-coming in from the window smells wet and earthy, new. The sun shines low
+window smells wet and earthy, new. The sun shines low on the horizon.
-on the horizon.<br />
+You log in to the internet and realize you are being told a story. You
-</p>
+start to listen, carefully and, full of love, touch the story to let it
-<p>You log in to the internet and realize you are being told a story.
+know you are there. Delicate-fingered, curious like a child holding a
-You start to listen, carefully and, full of love, touch the story to let
-it know you are there. Delicate-fingered, curious like a child holding a
 fallen bird. I hold you and the story tentatively.<br />
 </p>
 <p>I don’t know if I am touching you, to tell you the truth. Digital
@@ -984,8 +986,8 @@ eSq9p.<br />
 Fuck.<br />
 You try not to panic, but you know you have been detected.<br />
 </p>
-You pack up your things: the pie I made you, a love letter, a hand made
+You pack up your things: the pie I made you, a love letter, two hands
-out of felt, a star, a door, a stuffed animal; and you leave again.
+made out of felt, a star, a door, a stuffed animal; and you leave again.
 </div>
 <h2 id="thank-you">THANK YOU</h2>
 <p>Special thanks to Marloes de Valk, Michael Murtaugh, Manetta Berends,
@@ -1038,6 +1040,7 @@ doi:10.1177/1440783313486220.</p>
 <p>Yun, J. (2020) ‘The Leaving Season’, in Some Are Always Hungry.
 University of Nebraska Press.</p>
 <h1 id="water-bodies-1">&lt;/?water bodies&gt;</h1>
+>>>>>>> 0d34f2967a266c03a36514751c02bce2519f810f
 
     	</section>
    	 

print/print_style.css

@@ -99,7 +99,7 @@ blockquote .margin-note{
 	margin-left: -25mm;
 }
 .fake-margin-note{
-	margin: 20mm 0 0;
+	margin: 40mm 0 0;
 	a{color:var(--spot-color-1)};
 	h1{font-size: 7pt;}
 }
@@ -133,16 +133,6 @@ h1 {
     string-set: title content(text);
 }
 
-h2 {
-    font-size: 1.6em;
-}
-
-.h2-no-pagebreak {
-    font-size: 1.6em;
-    line-height: 1;
-    font-style: italic;
-    break-after: avoid;
-}
 
 .reset-margin-notes{
     counter-reset: markerNote_marginNote -10;
@@ -222,7 +212,3 @@ margin-left: 40mm;
 #digital-bodies + blockquote{
 	margin-right: 0;
 }
-
-#bibliography{
-    font-size: 6pt;
-}