From cb4a72d66b8a10ff87e9827f25f89f8d18fd1ca5 Mon Sep 17 00:00:00 2001
From: JoBCB <joaninha_quelhas@hotmail.com>
Date: Tue, 15 Dec 2020 10:08:42 +0100
Subject: [PATCH] added font Regular and removed yellow warning message

---
 static/css/style.css  | 57 +++++++++++++++++++++++--------------------
 templates/layout.html | 23 +++++++++--------
 2 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/static/css/style.css b/static/css/style.css
index 844822c..330d5f2 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -16,8 +16,8 @@ font-style: normal;
 }
 
 
-/*@font-face {
-font-family: 'Roboto';
+@font-face {
+font-family: 'Roboto Regular';
 src: url('webfonts/Roboto_Regular/Roboto-Regular.ttf') format('truetype');
 font-weight: normal;
 font-style: normal;
@@ -29,7 +29,7 @@ src: url('webfonts/Roboto_Regular/Roboto-Italic.ttf') format('truetype');
 font-weight: normal;
 font-style: normal;
 }
-*/
+
 /*new import font*/
 @import url('https://fonts.googleapis.com/css2?family=Roboto&display=swap');
 
@@ -230,7 +230,7 @@ html {
 	padding:0;
  	height: 100vh;
  	width: 100vw;
- 	font-family: 'Roboto Condensed', sans-serif;
+ 	font-family:  'Roboto Regular', 'Roboto Condensed', sans-serif;
  	font-size: 16px;
  	-webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
@@ -244,7 +244,7 @@ html {
 	}
 
 body {
-  font-family: Roboto Condensed;
+  font-family:  'Roboto Regular', 'Roboto Condensed', sans-serif;
 /*font-size: calc(12px + (20 - 12) * ((100vw - 320px) / (1600 - 320)));
   line-height: 1.63;*/
   font-weight: normal;
@@ -256,7 +256,7 @@ body {
   padding: 0;
 }
 body i {
- 	font-family: 'Roboto Condensed';
+ 	font-family: 'Roboto Italic', 'Roboto Condensed', sans-serif;
  	font-weight: normal;
  	font-stretch: normal;
 	font-style: italic;
@@ -644,7 +644,7 @@ tbody tr th a{
     margin-right: auto;
 	padding-top: 42px;
 	padding-bottom: 52px;
-	font-family: Roboto Condensed;
+	font-family: Roboto Condensed, sans-serif;
   	font-size: 14px;
   	line-height: 48px;
   	font-weight: bold;
@@ -706,7 +706,7 @@ a.paginate_button.next:after {
   height: 26px;
   font-size: 18px;
   line-height: 1.44;*/
-  font-family: Roboto Condensed;
+  font-family: Roboto Condensed, sans-serif;
   font-weight: bold;
   font-stretch: condensed;
   font-style: normal;
@@ -714,7 +714,7 @@ a.paginate_button.next:after {
   color: var(--black);
 }
 .date, div.artwork-relatedworks-date {
-  font-family: Roboto Condensed;
+  font-family: Roboto Condensed, sans-serif;
 /*font-size: 16px;
   line-height: 1.63;*/
   font-weight: normal;
@@ -768,7 +768,7 @@ a.paginate_button.next:after {
 .artwork-button {
   width: 76px;
   height: 24px;
-  font-family: Roboto Condensed;
+  font-family: Roboto Condensed, sans-serif;
 /*  font-size: 16px;
   line-height: 1.5;*/
   font-weight: normal;
@@ -800,7 +800,7 @@ div#home-top-div{
 	grid-template-rows: auto auto;
 }
 .heading_A {
-  font-family: Roboto Condensed;
+  font-family: Roboto Condensed, sans-serif;
 /*  font-size: 40px;
   line-height: 1.45;*/
   font-weight: normal;
@@ -1008,7 +1008,7 @@ div#home-top-div{
   }
 }
 .scroll-down {
-  font-family: Roboto Condensed Bold;
+  font-family: 'Roboto Condensed Bold', sans-serif;
   font-size: 14px;
   font-weight: bold;
   font-stretch: condensed;
@@ -1153,7 +1153,7 @@ div.home-show-wrapper a:hover {
 }
 .mw-parser-output h1, .Heading_B {
 	margin-block-end: 1.5em;
-  font-family: Roboto Condensed Bold;
+  font-family: 'Roboto Condensed Bold', sans-serif;
 /*  font-size: calc(22 + (25 - 22) * ((100vw - 320px) / (1600 - 320)));
   line-height: 35px;*/
   font-weight: bold;
@@ -1171,7 +1171,7 @@ div.home-show-wrapper a:hover {
   margin: 0 !important;
 }
 .mw-parser-output blockquote p {
-  font-family: Roboto Condensed;
+  font-family: 'Roboto Condensed', sans-serif;
 /*  font-size: calc(20px + (30 - 20) * ((100vw - 320px) / (1600 - 320)));
   line-height: 1.56;*/
   font-weight: normal;
@@ -1191,7 +1191,7 @@ div.home-show-wrapper a:hover {
 }
 
 .Heading_C, .mw-parser-output h2, h2 {
-  font-family: Roboto Condensed;
+  font-family: 'Roboto Condensed', sans-serif;
 /* font-size: calc(20px + (30 - 20) * ((100vw - 320px) / (1600 - 320)));
   line-height: 40px;
   margin: 0px 0px 30px 0px;	*/
@@ -1202,7 +1202,7 @@ div.home-show-wrapper a:hover {
   color: var(--black);
 }
 .Heading_D, .mw-parser-output h3, h3 {
-  font-family: Roboto Condensed;
+  font-family: 'Roboto Condensed', sans-serif;
 /*  font-size: calc(22px + (25 - 22) * ((100vw - 320px) / (1600 - 320)));
   line-height: 35px;*/
   font-weight: normal;
@@ -1212,7 +1212,7 @@ div.home-show-wrapper a:hover {
   color: var(--black);		
 }
 .Heading_E {
-  font-family: Roboto Condensed;
+  font-family: 'Roboto Condensed', sans-serif;
 /*  font-size: calc(16px + (20 - 16) * ((100vw - 320px) / (1600 - 320)));
   line-height: 20px;*/
   font-weight: normal;
@@ -1227,7 +1227,7 @@ div.home-show-wrapper a:hover {
   grid-column-end: 15;
 }
 .mw-parser-output ul {
-  font-family: Roboto Condensed;
+  font-family: 'Roboto Condensed', sans-serif;
 /*  font-size: calc(12px + (20 - 12) * ((100vw - 320px) / (1600 - 320)));
   line-height: 1.63;*/
   font-weight: normal;
@@ -1245,7 +1245,7 @@ div.home-show-wrapper a:hover {
 	height: auto;
 }
 .mw-parser-output img {
-	font-family: Roboto Condensed;
+	font-family: 'Roboto Condensed', sans-serif;
 /*  font-size: calc(12px + (20 - 12) * ((100vw - 320px) / (1600 - 320)));
   	line-height: 1.63;*/
 	text-decoration: none;
@@ -1256,7 +1256,7 @@ div.home-show-wrapper a:hover {
   	color: var(--black);
 }
 .mw-parser-output a {
-  font-family: Roboto Condensed;
+  font-family: 'Roboto Regular', 'Roboto Condensed', sans-serif;
 /*  font-size: calc(12px + (20 - 12) * ((100vw - 320px) / (1600 - 320)));
   line-height: 1.63;*/
   font-weight: normal;
@@ -1372,7 +1372,7 @@ div.browsebycategory-categories:hover {
 }
 
 .artwork-box {
-  font-family: Roboto Condensed;
+  font-family: 'Roboto Condensed', sans-serif;
   font-size: 16px; 
   font-weight: normal;
   font-stretch: condensed;
@@ -1384,7 +1384,7 @@ div.browsebycategory-categories:hover {
   border: solid 1px var(--black);
   margin: 30px 8vw 0px 8vw;
   padding: 6px 10px;
-  max-width:  96px;
+  max-width:  120px;
 }
 
 
@@ -1399,7 +1399,7 @@ div.browsebycategory-categories:hover {
 }
 
 .artwork-intro {
-  font-family: Roboto Condensed;
+  font-family: 'Roboto Condensed', sans-serif;
 /*  font-size: calc(12px + (20 - 12) * ((100vw - 320px) / (1600 - 320)));
   line-height: 1.63;*/
   font-weight: normal;
@@ -1431,7 +1431,7 @@ div.browsebycategory-categories:hover {
 }
 .artwork-nav-label, .label-item, .tns-item p:first-of-type {
   margin: 25px 0 12px 1px;
-  font-family: Roboto Condensed;
+  font-family: 'Roboto Condensed', sans-serif;
 /*  font-size: calc(14px + (18 - 14) * ((100vw - 320px) / (1600 - 320)));
 */  font-weight: normal;
   font-stretch: condensed;
@@ -1732,7 +1732,7 @@ div.browsebycategory-categories:hover {
 	width: 100%;
 }
 .metadata-link, .metadata-link a, .metadata-link a span {
-  font-family: Roboto Condensed Bold;
+  font-family: 'Roboto Condensed Bold', sans-serif;
 /*  font-size: 18px;
   line-height: 1.44;*/
   font-weight: bold;
@@ -1743,7 +1743,7 @@ div.browsebycategory-categories:hover {
   text-decoration-color:var(--blue-blue);
 }
 .label-item-date-artwork{
-  font-family: Roboto Condensed Bold;
+  font-family: 'Roboto Condensed Bold', sans-serif;
   font-weight: bold;
   font-stretch: condensed;
   font-style: normal;
@@ -1760,7 +1760,7 @@ div.browsebycategory-categories:hover {
   text-decoration-color: black;	
 }
 .metadata-link p {
-	font-family: Roboto Condensed;
+	font-family: 'Roboto Condensed', sans-serif;
 	font-weight: normal;
   	font-stretch: normal;
   	font-style: normal;
@@ -1991,6 +1991,9 @@ div#tutorials-intro h3, div#tutorials-intro p {
 		display: initial;
 	}
 
+	#link-search{
+		padding-right: 26px;
+	}
 	#navigation {
 		display: none !important;
 	}
diff --git a/templates/layout.html b/templates/layout.html
index 579e234..a1c8fdd 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -22,9 +22,9 @@
 			</div>
 		</div>
 
-		<div id="message-mobile">
-			<p>Mobile version coming soon, please view on desktop</p>
-		</div>
+		<!-- <div id="message-mobile">
+		<p>Mobile version coming soon, please view on desktop</p>
+		</div> -->
 
 <div id="header">
 	<div id="animatedlogo">
@@ -36,16 +36,19 @@
 			<div id="header-title">
 				<a href="{{ url_for('home') }}">DAAP</a>
 			</div> 
-			<!-- <div id="header-keyword-search">
-				<input type="text" id="fname" name="fname" value="" placeholder="Keyword search"> 
-			</div> 
-			<div class="container" onclick="myFunction(this)"> 
+
+			<a id="link-search" href="https://daap.bannerrepeater.org/w/index.php?search=&search=&title=Special%3ASearch&go=Go" >
+				<div id="header-keyword-search">
+				<!-- <input type="text" id="fname" name="fname" value="" placeholder="Keyword search">  -->
+				</div> 
+			</a>
+			<!-- <div class="container" onclick="myFunction(this)"> 
 
 			</div> -->
 			 
-			<div class="web-dev-placeholder">
-				<p>WEBSITE IN DEVELOPMENT</p>
-			</div>
+			<!-- <div class="web-dev-placeholder">
+			<p>WEBSITE IN DEVELOPMENT</p>
+			</div> -->
 			
 			<a id="mobtop" class="mobile-nav-icon mob-menu-icon" onclick="showMenu('navigationmobile'); toggleMenu();"></a>
 		</div>