Merge branch 'master' of https://git.xpub.nl/XPUB/project.xpub.nl

6 years ago · 53dc46ddcc
parent b66dfb93c0 4834cb2922
commit 53dc46ddcc
8 changed files with 44 additions and 37 deletions
--- a/2019/Alexander_Roidl/index.html
+++ b/2019/Alexander_Roidl/index.html
@ -0,0 +1,5 @@
+<html>
+Alexander Roidl
+
+
+<html>
--- a/2019/Angeliki_Diakrousi/index.html
+++ b/2019/Angeliki_Diakrousi/index.html
@ -11,6 +11,7 @@
 </head>

 <body>
- <img src='reasonable.jpg' width='50%'/>
+    <iframe src="https://hub.xpub.nl/screaming/" scrolling="no" allowtransparency="true" width="100%" height="1600px" frameborder="0"></iframe>
 </body>
+
 </html>
--- a/2019/Zalan_Szakacs/index.html
+++ b/2019/Zalan_Szakacs/index.html
@ -0,0 +1,2 @@
+
+test tesT
--- a/fonts/tenor.ttf
+++ b/fonts/tenor.ttf
--- a/img/2018_grad_logo_inverted.png
+++ b/img/2018_grad_logo_inverted.png
--- a/img/xpub-logo-2019.png
+++ b/img/xpub-logo-2019.png
--- a/index.html
+++ b/index.html
@ -343,7 +343,7 @@
 	 </div>
 	 <div class='subrow'>
 	 <p class='subcl1'>Angeliki Diakrousi</p>
-	 <p class='subcl2'><a href='2019/Angeliki_Diakrousi/empty.html' target="_blank" class='ext'>Project Name</p>
+	 <p class='subcl2'><a href='2019/Angeliki_Diakrousi/index.html' target="_blank" class='ext'>Podcast Utterances</a></p>
 	 <p class='subcl3'><!--a href='test.pdf' target="_blank" class='ext'>PDF</a> // <a href='#2018-att2' class='int'>IMG</a--></p>
 	 </div>
 	 <div class='subrow'>
@ -353,7 +353,7 @@
 	 </div>
 	 <div class='subrow'>
 	 <p class='subcl1'>Alexander Roidl</p>
-	 <p class='subcl2'><a href='2019/Alexander_Roidl/empty.html' target="_blank" class='ext'>Project Name</a></p>
+	 <p class='subcl2'><a href='2019/Alexander_Roidl/index.html' target="_blank" class='ext'>Poetic Software</a></p>
 	 <p class='subcl3'><!--a href='test.pdf' target="_blank" class='ext'>PDF</a> // <a href='#2018-att4' class='int'>IMG</a--></p>
 	 </div>
 	 <div class='subrow'>
@ -363,14 +363,14 @@
 	 </div>
 	 <div class='subrow'>
 	 <p class='subcl1'>Zalán Szakács</p>
-	 <p class='subcl2'><a href='2019/Zalan_Szakacs/empty.html' target="_blank" class='ext'>Project Name</a></p>
+	 <p class='subcl2'><a href='2019/Zalan_Szakacs/index.html' target="_blank" class='ext'>Project Name</a></p>
 	  <p class='subcl3'><!--a href='test.pdf' target="_blank" class='ext'>PDF</a> // <a href='#2018-att6' class='int'>IMG</a--></p>
 	 </div>

 </div>
 </div>
 <div id='year2018' class='row'>
-<div class='col1'><img src='img/2018_grad_logo.png' class='logo'/><p class='gradShow'>Ex, XPUB</p><p>2018</p></div>
+<div class='col1'><img src='img/2018_grad_logo_inverted.png' class='logo'/><p class='gradShow'>Ex, XPUB</p><p>2018</p></div>
 <div class='col2'>
 <p><a href='#2018-att-video' class='int'>Video trailer</a></p>
 </div>
--- a/main.css
+++ b/main.css
@ -13,6 +13,11 @@
    src: url(fonts/courierprime.ttf);
 }

+@font-face {
+    font-family: tenor;
+    src: url(fonts/tenor.ttf);
+}
+
 * {
    box-sizing: border-box;
 }
@ -30,7 +35,7 @@ body{
  	bottom: 0;
  	right: 0;
  	z-index: -1;
-  	background-color:  #1a1a1a;
+  	background-color:  #2f2f2f;
 }

 /*header*/
@ -46,7 +51,7 @@ header{
 }

 header h1{
-	font-family:courierprime;
+	font-family:tenor;
 	font-size:9vw;
 	float:left;
 	width:60%;
@ -130,13 +135,13 @@ header h1{

 #getback{
 	text-decoration:underline;
-	text-decoration-color:#99ff99;
+	text-decoration-color:#0f0;
+	z-index:100;

 }

 #getback:hover{
 	text-decoration: overline;
-	font-family:inconsolatabold;
 	text-decoration-color:magenta;
 }

@ -181,7 +186,7 @@ header h1{
 .upbar {
 	height:5%;
 	width:100%;
-	background-color:#99ff99;
+	background-color:#0f0;
 	position:relative;

 }
@ -370,25 +375,19 @@ p.subcl3{

 a{
 	color:white;
-	text-decoration-color:#99ff99;
+	text-decoration-color:#0f0;
 }

 .ext:hover {
 	text-decoration: overline;
-	font-family:inconsolatabold;
 	text-decoration-color:yellow;
 }

 .int:hover {
 	text-decoration: overline;
-	font-family:inconsolatabold;
 	text-decoration-color:magenta;
 }

-#show:hover{
-	font-family:courierprime;
-}
-

 .gradShow {
 	font-weight:bold;
@ -733,7 +732,7 @@ header{
 }

 header h1{
-	font-size:7vw;
+	font-size:6vw;
 	margin-bottom:13%;
 	width:77%;
 	float:none;
@ -785,14 +784,14 @@ header h1{
 }

 #ihtp{
-	width:80%;
+	width:70%;
 	position:relative;
 	top:0;
 	left:0;
 	-webkit-transform:none;
 	-ms-transform:none;
 	transform:none;
-	font-size:calc(9px + 0.6vw);
+	font-size:calc(9px + 0.5vw);
 	line-height:125%;
 	
 }
@ -877,7 +876,7 @@ p.subcl3{
 }

 .row{
-	border-bottom-width:7px;
+	border-bottom-width:5px;
 }