From: John Dallahan <redacted>
Date: Thu, 3 Mar 2016 08:46:25 +0000 (+0200)
Subject: Merge branch 'master' into 404
X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/commitdiff_plain/a895232a75a203c7f480a9b1eaab4e687b7b2585?hp=0764ec64d456bfb7a6fa3978feb163055dae9219

Merge branch 'master' into 404
---

diff --git a/static/css/style.css b/static/css/style.css
index facab3282..a05330699 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -109,7 +109,7 @@ img {
     width: 100%;
     min-height: 100vh;
     padding-top: 50px;
-    padding-bottom: 17rem;
+    padding-bottom: 12.5rem;
 }
 
 .main {
@@ -159,7 +159,33 @@ hr {
     background: var(--jumbotron-bg);
     box-shadow: 0 1px 5px rgba(0, 0, 0, 0.6);
     color: var(--jumbotron-text-color);
-    padding: 8em 0 4em 0;
+    padding: 4em 0 4em 0;
+}
+
+.jindex {
+    z-index: 102;
+}
+
+.jlogo {
+    display: block;
+    margin: 25px auto;
+}
+
+.jpia {
+    position: absolute;
+    height: 40px;
+    right: 0; 
+    top: 0;
+    margin: 25px;
+}
+
+@media (--max-sm) {
+    .jlogo {
+        margin: 2em auto -2em auto;
+    }
+    .jumbotron {
+        padding-bottom: 2em;
+    }
 }
 
 .child {
@@ -266,7 +292,7 @@ h1 {
 }
 
 .art-info {
-    line-height: 2.1;
+    margin-top: 2.1em;
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
@@ -364,8 +390,8 @@ h1 {
 /* footer */
 .footers {
     /*min-height: 30vh;*/
-    margin-top: -17rem;
-    min-height: 17rem;
+    margin-top: -12rem;
+    min-height: 12rem;
 }
 
 .footer {
@@ -373,8 +399,7 @@ h1 {
     color: var(--footer-text-color);
     width: 100%;
     box-shadow: 0 -3px 5px rgba(150,150,150,.36);
-    min-height: 15.5rem;
-
+    min-height: 10.5rem;
     padding: 3em 0;
 }
 
@@ -394,7 +419,7 @@ h1 {
 }
 
 .footerchild:last-child {
-    margin-bottom: 1em;
+    margin-bottom: .5em;
 }
 
 .footer-push {
@@ -426,22 +451,45 @@ footer a:hover {
     padding-left: 30px;
 }
 
-@media (--max-md) {
+@media (--max-sm) {
     .footer-container {
         flex-direction: column;
     }
 
     .footer-push {
         margin-left: 0;
+        width: 100%;
     }
 
     .footerchild ul li:last-child {
         margin-bottom: .5em;
     }
 
+    .footer-push ul li:last-child {
+        margin-bottom: .1em;
+    }
+
     .hdn {
         display: none;
     }
+    .footer {
+        padding: .5em 0;
+    }
+    .footer-push ul {
+        display: flex;
+        flex-wrap: wrap;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: flex-start;
+        text-align: center;
+    }
+    .footer-push ul li {
+        display: inline-block;
+        font-size: 12vw;
+    }
+    .footer-push ul li img {
+        height: 12vw;
+    }
 }
 
 .footer h2, .footer h3 {
diff --git a/templates/faq_index.html b/templates/faq_index.html
index 2c6c979f0..ff1575668 100644
--- a/templates/faq_index.html
+++ b/templates/faq_index.html
@@ -8,7 +8,7 @@
     {% for button in index.promote %}
         <a class="box" href="{{ button.entry.url }}">
             <i class="fa fa-{{ button.icon }} fa-4x"></i>
-            <div>{{ button.caption }}</div>
+            <span>{{ button.caption }}</span>
         </a>
     {% endfor %}
     </div>
diff --git a/templates/footer.html b/templates/footer.html
index 976316fe0..d9240ae7c 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -20,17 +20,17 @@
             {%- for link in config.SOCIAL %}
             <li>
                 <a href="{{ link.link }}" target="_blank">
-                    <i class="fa fa-{{ link.icon }} fa-fw"></i> {{ link.name }}</a>
+                    <i class="fa fa-{{ link.icon }} fa-fw"></i> <span class="hdn">{{ link.name }}</span></a>
             </li>
             {%- endfor %}
             <li>
                 <a href="{{ url_for("archive") }}"><i class="fa fa-rss fa-fw"></i>
-                News Archive</a>
+                <span class="hdn">News Archive</span></a>
             </li>
             <li>
                 <a href="https://www.privateinternetaccess.com/pages/buy-vpn/freend/" target="_blank"><img alt="PIA" height=
                 "14px" class="fa-fw" src="{{ url_for("static/img/logos/pia-robot-original.svg") }}">
-                Private Internet Access</a>
+                <span class="hdn">Private Internet Access</span></a>
             </li>
         </ul>
         </div>
diff --git a/templates/index.html b/templates/index.html
index 5f870d3f4..74a114df3 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2,7 +2,9 @@
 {% block title %}{{ config.name }}{% endblock %}
 {% import "artinfo.html" as artinfo %}
 {% block content %}
-<div class="jumbotron">
+<div class="jumbotron jindex">
+    <a href="{{ url_for("index") }}"><img alt="freenode" class="jlogo" src="{{ url_for("static/img/logos/coloured-alphabg.svg") }} "/></a>
+    <a href="https://www.privateinternetaccess.com/pages/buy-vpn/freend/" target="_blank"><img alt="Private internet access" class="jpia" src="{{ url_for("static/img/logos/PIALogo_white.svg") }}"></a>
     <h2 class="child">Welcome to freenode&thinsp;—&thinsp;supporting free and open source communities since 1998</h2>
     <div class="box-container">
         <a class="box" href="{{ url_for("kb/index/chat") }}">