From: Christel Dahlskjaer <redacted>
Date: Thu, 10 Mar 2016 22:55:55 +0000 (+0000)
Subject: Merge pull request #116 from tinyhippw/tinyhippo-whitespace
X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/commitdiff_plain/78f36cc1b822c2127494585cb362fe02a0103b5f?hp=10218a7697df4fb3e4eeda418050b153e4037a50

Merge pull request #116 from tinyhippw/tinyhippo-whitespace

better use of whitespace
---

diff --git a/static/css/style.css b/static/css/style.css
index 20afa9c58..3893d8543 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -104,6 +104,13 @@ img {
     height: 40px;
 }
 
+.tlogo {
+    height: 40px;
+    margin-bottom: -9px;
+    margin-left: -10px;
+    margin-right: -10px;
+}
+
 /* main */
 .container {
     width: 100%;
@@ -163,7 +170,7 @@ hr {
 }
 
 .jindex {
-    z-index: 102;
+    z-index: 99;
 }
 
 .jlogo {
diff --git a/templates/artinfo.html b/templates/artinfo.html
index 4e424beb8..e8f10e939 100644
--- a/templates/artinfo.html
+++ b/templates/artinfo.html
@@ -8,13 +8,13 @@
 {% macro nav(article) %}
 <div class="art-nav">
     {% if article.older -%}
-    <a href="{{ article.older.url }}">older</a>
+    <a href="{{ article.older.url }}">previous article</a>
     {%- else -%}
     <span></span>
     {%- endif -%}
-    <a href="{{ url_for("archive") }}">all</a>
+    <a href="{{ url_for("archive") }}">view archive</a>
     {%- if article.newer %}
-    <a href="{{ article.newer.url }}">newer</a>
+    <a href="{{ article.newer.url }}">next article</a>
     {%- else %}
     <span></span>
     {%- endif %}
diff --git a/templates/index.html b/templates/index.html
index 74a114df3..4d78ebdb1 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -3,9 +3,7 @@
 {% import "artinfo.html" as artinfo %}
 {% block content %}
 <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>
+    <h2 class="child">Welcome to <img alt="freenode" class="tlogo" src="{{ url_for("static/img/logos/coloured-alphabg.svg") }}" />&thinsp;—&thinsp;supporting free and open source communities since 1998</h2>
     <div class="box-container">
         <a class="box" href="{{ url_for("kb/index/chat") }}">
             <i class="fa fa-comments fa-4x"></i>
@@ -27,7 +25,7 @@
     <div class="art-body">{{ article.render() }}</div>
     <div class="art-nav">
         <span></span>
-        <a href="{{ url_for("archive") }}">all</a>
+        <a href="{{ url_for("archive") }}">view archive</a>
         <span></span>
     </div>
     {% endwith %}