From 9f4a9703ea6defc8451de1aa7a44e13623be742d Mon Sep 17 00:00:00 2001
From: JoBCB <joaninha_quelhas@hotmail.com>
Date: Thu, 12 Nov 2020 11:48:37 +0000
Subject: [PATCH] adjusted style after feedback Lozana

---
 static/css/style.css  | 56 +++++++++++++++++++++++++++----------------
 templates/layout.html |  8 +++++--
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/static/css/style.css b/static/css/style.css
index cde635c..62eb1df 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -123,9 +123,11 @@ div#animatedlogo img{
 	justify-self: center;
 }
 div#header-title{
-	font-family: 'Roboto Condensed', sans-serif;
+	font-family: 'Roboto Condensed Bold', sans-serif;
 	font-weight: bold;
 	font-size: 25px;
+	line-height: 35px;
+	letter-spacing: 1.88px;
 }
 div#header-title a:link, div#header-title a:visited {
 	text-decoration: none;
@@ -194,9 +196,10 @@ div#navigation a{
 	text-decoration: none;
 	font-weight: normal;
 	color: var(--black);
-	font-size: calc(16px + (20 - 16) * ((100vw - 768px) / (1400 - 768)));
-	line-height: calc(22px + (22 - 26) * ((100vw - 768px) / (1400 - 768)));
-}
+	font-size: calc(14px + (18 - 14) * ((100vw - 768px) / (1400 - 768)));
+	line-height: 26px;
+/*	line-height: calc(22px + (22 - 26) * ((100vw - 768px) / (1400 - 768)));
+*/}
 
 div#navigation a:hover {
 	text-decoration: underline;
@@ -250,7 +253,7 @@ div#footer{
 div#footer-title-br p, div#footer-title-others p, div#footer-title-contact p, div#footer-title-socials p{
 	text-transform: uppercase;
 	font-family: 'Roboto Condensed', sans-serif;
-	font-size: calc(16px + (20 - 16) * ((100vw - 768px) / (1400 - 768)));
+	font-size: calc(14px + (18 - 14) * ((100vw - 768px) / (1400 - 768)));
   	font-weight: normal;
   	font-stretch: condensed;
   	font-style: normal;
@@ -259,10 +262,21 @@ div#footer-title-br p, div#footer-title-others p, div#footer-title-contact p, di
   	color: var(--brown-grey);
 }
 div#footer-img-br img{
-    width: 100%;
-	max-width: 90px;
+	width: 70px;
 	height: auto;
     padding-top: 20px;
+    margin-left: -8px;
+}
+div#footer-img-br figcaption{
+	font-family: 'Roboto', sans-serif;
+	font-size: 16px;
+	margin: 0;
+	padding: 0;
+	line-height: 26px;
+  	font-style: normal;
+  	font-weight: normal;
+  	white-space: nowrap;
+  	margin-top: -8px;	
 }
 div#footer-img-others{
 	display: flex;
@@ -274,20 +288,19 @@ div#footer-img-lottery{
 	padding-left: 60px;
 }
 div#footer-img-lottery img{
-	width: 100%;
-	max-width: 124px;
+	width: 124px;
 	height: auto;
 }
 div#footer-img-wiki img{
-	width: 100%;
-	max-width: 56px;
+	width: 56px;
 	height: auto;
 }
 div#footer-socials-links a{
 	text-decoration: none;
 	color:#FFFFFF;
 	font-family: 'Roboto Regular', sans-serif;
-	font-size: calc(16px + (20 - 16) * ((100vw - 768px) / (1400 - 768)));
+	font-size: calc(14px + (18 - 14) * ((100vw - 768px) / (1400 - 768)));
+	line-height: 26px;
 	font-weight: normal;
  	font-stretch: normal;
   	font-style: normal;
@@ -298,7 +311,7 @@ div#contactform{
     align-items: center;
     justify-content: center;
 }
-#footer-contact a {
+#contactform span, a.footer-contact {
     text-decoration: none;
 	color:#FFFFFF;
 }
@@ -341,7 +354,7 @@ div#footer{ flex-wrap: wrap; }
 div.pagetitle{
 	margin: 60px 80px 30px 80px;
 	font-size: 25px;
-	font-family: 'Roboto Condensed', sans-serif;
+	font-family: 'Roboto Condensed Bold', sans-serif;
 	font-weight: bold;
 	text-transform: uppercase;
 	letter-spacing: 1.88px;
@@ -384,9 +397,9 @@ thead tr th{
 }
 
 tbody tr th{
-	font-size: 18px;
+	font-size: calc(14px + (18 - 14) * ((100vw - 768px) / (1400 - 768)));
 	line-height: 26px;
-	font-family: 'Roboto Condensed', sans-serif;
+	font-family: 'Roboto', sans-serif;
 	font-weight: normal;
 }
 
@@ -399,7 +412,9 @@ tbody tr th a{
   min-width: 56px; 
   max-width: 128px; /*56px * 2 + 16*/
 }
-.label { font-weight: bold;
+.label { 
+  font-family: Roboto Condensed Bold, sans-serif;
+  font-weight: bold;
   min-width: 128px; 
   max-width: 272px;/*56px * 4 + 16 * 3*/
   }
@@ -511,8 +526,8 @@ a.paginate_button.next:after {
 .primary-button {
   max-width: 365px;
   min-height: 48px;
-  font-family: 'Roboto Condensed Bold';
-  font-size: 14px;
+  font-family: 'Roboto Condensed Bold', sans-serif;
+  font-size: calc(12px + (16 - 12) * ((100vw - 768px) / (1400 - 768)));
   line-height: 16px;
   font-weight: bold;
   font-stretch: condensed;
@@ -520,6 +535,7 @@ a.paginate_button.next:after {
   line-height: normal;
   letter-spacing: 1.5px;
   text-align: center;
+  text-decoration: none;
   color: #ffffff;
   cursor: pointer;
   background-color: var(--blue-blue);
@@ -731,7 +747,7 @@ div.browsebycategory-categories{
 }
 
 div.browsebycategory-categories a { 
-	font-family: Roboto Condensed;
+	font-family: 'Roboto Condensed Bold', sans-serif;
 	color: #ffffff;
 	text-decoration: none;
 	margin: auto; 
diff --git a/templates/layout.html b/templates/layout.html
index 7ec14aa..05e57da 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -49,7 +49,11 @@
 	<div class="footer-left">
 		<div id="footer-credit">
 			<div id="footer-title-br"><p>A project by</p></div>
-			<div id="footer-img-br"><img src="{{ url_for('static', filename='/imgs/Logos/Banner-Repeater-logo.png') }}"></div>
+			<div id="footer-img-br">
+
+				<img src="{{ url_for('static', filename='/imgs/Logos/Banner-Repeater-logo.png') }}">
+				<figcaption>Banner Repeater</figcaption>
+			</div>
 		</div>
 		<div id="footer-funds">
 			<div id="footer-title-others"><p>With support from</p></div>
@@ -71,7 +75,7 @@
 		</div>
 		<div id="footer-contact-form">			
 				<div id="footer-title-contact"><p>EXPRESSION OF INTEREST</p></div>
-				<div id="footer-contact primary-button"><a href=""><div class="primary-button bluebutton" id="contactform"><span>CONTACT FORM</span></div></a></div>
+				<div id="primary-button"><a class="footer-contact" href=""><div class="primary-button bluebutton" id="contactform"><span>CONTACT FORM</span></div></a></div>
 		</div>	
 	</div>	
 </div>