update fonts and headers

diff --git a/static/css/style.css b/static/css/style.css
index ce18f6af84adc39e5d28b8461027eedb9e65cea7..864b906f93bc6832a1f14e3ac4bb66de931168f0 100644 (file)
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -1,62 +1,24 @@
+@import url('https://fonts.googleapis.com/css?family=Open+Sans|Source+Sans+Pro');
+
 body {
   font-weight: 400;
   line-height: 1.65em;
-  font-family: 'Verdana', sans-serif;
-}
-
-header img {
-  width: 120px;
-  height: 120px;
-}
-
-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center; /*vertical centering*/
-  padding: 10px 40px;
-  background: linear-gradient(to bottom, #ccc, white);
-}
-
-header ul {
-  display: flex;
-  margin: 0; /*taking the margin and padding ul default size off*/
-  padding: 0;
-  list-style-type: none;
+  font-family: 'Open Sans', sans-serif;
 }
 
-header li {
-  padding: 2.5em;
-}
-
-header li a {
-  color: #333;
-  text-decoration: none;
-}
-
-main {
-  padding: 2em;
-  line-height: 1.1;
-  display: flex;
-  justify-content: space-between;
-  align-items: stretch; /*vertical centering*/
-  flex-grow: 1;
-}
-
-main section {
-  flex-grow: 1;
-  flex-basis: 33%;
-  padding: 20px;
-  border-right: solid 1px #b9b9b9;
-  text-align: justify;
+h1, h2, h3, h4 {
+  font-family: 'Source Sans Pro', sans-serif;
 }
 
 h2 {
-  font-size: 1em;
+  font-size: 2rem;
+  font-weight: 600;
   text-align: center;
 }
 
 h3 {
-  font-size: 0.8em;
+  font-size: 1.5rem;
+  font-weight: 600;
   text-align: center;
 }
 
@@ -264,6 +226,7 @@ ul.icons li .icon:before {
       margin: 0;
       display: inline-block;
       font-size: 1.25em;
+      font-weight: 600;
   }
 
   /* MEDIA QUERIES */

diff --git a/templates/base.html b/templates/base.html
index 0407e4f0564db9bf88453d6bf175b6a8de5452bc..ba5512008f8ba224dd196ebc9b2b6fbbeaffdea1 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -13,7 +13,6 @@
 
        <title>{%block title%}PgDU 2018{%endblock%}</title>
 
-       <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
        <script src="{{media("js/main.js")}}"></script>
        <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
@@ -57,21 +56,19 @@
       </section>
 
            <!-- Footer -->
-               <footer id="footer">
-                   <div class="container">
-                       <section class="links">
-                           <div class="row">
-                               <div class="col">
-                                   <h3>Contact Us</h3>
-                                   <a href="mailto:pgdu-committee@lists.pgdu.org">pgdu-committee@lists.pgdu.org</a>
-                                   <ul class="copyright">
-                                       <li>&copy; 2018 PostgreSQL Down Under Inc.</li>
-                                   </ul>
-                               </div>
-                           </div>
-                       </section>
-                   </div>
-               </footer>
+           <footer>
+               <ul class="icons">
+                   <li>
+                       <a href="https://www.facebook.com/PostgresOpen" class="fa fa-facebook"><span class="label">Facebook</span></a>
+                   </li>
+                   <li>
+                       <a href="https://twitter.com/postgresopen" class="fa fa-twitter"><span class="label">Twitter</span></a>
+                   </li>
+               </ul>
+               <p>
+                   <a href="mailto:pgdu-committee@lists.pgdu.org">pgdu-committee@lists.pgdu.org</a> | © 2018 PostgreSQL Down Under Inc.
+         </p>
+         </footer>
 
    </body>
 </html>

diff --git a/templates/index_base.html b/templates/index_base.html
index 787850672b7c564baa04820490b16c355ce61839..e6c993693a838a1c7894d359287fd434192a8206 100644 (file)
--- a/templates/index_base.html
+++ b/templates/index_base.html
@@ -13,7 +13,6 @@
 
        <title>{%block title%}PgDU 2018{%endblock%}</title>
 
-       <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
        <script src="{{media("js/main.js")}}"></script>
        <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">