changes

10/index.html

@@ -214,8 +214,7 @@ Being sensibilized, gaining awareness and gradually understanding the structures
 			 <a class="link_title" href="https://pzwiki.wdka.nl/mediadesign/User:Peach/issue-10-lfp" target="_blank">Personal Website</a>
 	     </div>
 
-
+		<a href="#ioanna_module"> <div id="ioana" class="moduletext"><h1 class="name_T">Ioana Tomici</h1></div></a>
-		<a href="#ioanna_module"> <div id="Ioanna" class="moduletext"><h1 class="name_T">Ioana Tomici</h1></div></a>
 		<p>As single modules perform one job and one job well, you will have to anticipate and even require the output of someone elses module in order for yours to work. Coinciding with your research we will create one or several 'outputs' consisting of an interface, electronics and a manual.</p>
 		<button type="button" class="collapsible">Read More</button>
 		<div class="extended">
@@ -480,7 +479,7 @@ _ ⯐ LDR 🢒🢒 LDR
 
 <a id="ioanna_module">
 	<div id="ioana" class="moduleimg">
-		<a href="#ioana_T">
+		<a href="#ioana">
 			<img src="img/pcb_ioana.png"/>
 		</a>
 </a>

10/style.css

@@ -11,10 +11,24 @@
   font-weight: bold;
   font-style: normal;}
 
-/*    src: url("font/Roboto.otf") format("opentype");
+  @font-face {
-  font-weight: 300;
+  font-family: "Roboto";
-  font-style: normal;
+  src: url("font/Roboto-Regular.ttf") format("truetype");
-*/
+  font-weight: regular;
+  font-style: normal;}
+
+  @font-face {
+  font-family: "Roboto";
+  src: url("font/Roboto-BoldItalic.ttf") format("truetype");
+  font-weight: bold;
+  font-style: italic;}
+
+  @font-face {
+  font-family: "Roboto";
+  src: url("font/Roboto-Italic.ttf") format("truetype");
+  font-weight: regular;
+  font-style: italic;}
+
 
 /* style edits */
 a{
@@ -47,8 +61,14 @@ a:visited{
 
 body
   {
+<<<<<<< HEAD
   width:100%;
   background-color: #21632c;
+=======
+    font-family: "Roboto", sans-serif;
+      width:100%;
+  background-color: white;
+>>>>>>> f088d357090d27adbb400e007445eee95f85116b
   font-size: calc(8px + 0.7vw);
   scrollbar-width: none;
   border: none;
@@ -167,34 +187,34 @@ div #maingif{
 
 div#define {
   max-width: 90%;
-  text-align: justify;
+  /*! text-align: justify; */
   display: block;
     margin-left: auto;
     margin-right: auto;
     font-family: "OCRAStd";
     font-size: 1.5vw;
     padding-top: 5%;
-    color:black;
+    color:#fff;
 }
 
 div#pzi {
   max-width: 90%;
-  text-align: justify;
+  /*! text-align: justify; */
   display: block;
     margin-left: auto;
     margin-right: auto;
-    font-family: "Roboto";
+    font-family: "OCRAStd";
     font-size: 1.5vw;
-    color:black;
+    color:white;
 }
 
 div#names {
   max-width: 90%;
-  text-align: justify;
+  /*! text-align: justify; */
   display: block;
     margin-left: auto;
     margin-right: auto;
-    font-family: "Helvetica";
+    font-family: "OCRAStd";
     font-style: "light";
     color: white;
     font-size: 1.2vw;
@@ -202,13 +222,13 @@ div#names {
 
 div#intro {
   max-width: 90%;
-  text-align: justify;
+  /*! text-align: justify; */
   display: block;
     margin-left: auto;
     margin-right: auto;
-    font-family: "Roboto";
+    font-family: "OCRAStd";
     font-size: 1.2vw;
-    color: black;
+    color: white;
 }
 
 /* div.moduleimg{

test.html

@@ -1 +0,0 @@
-“hi”