Merge pull request #703 from aleylara/master

Update Peli-Kiera. Fix issue with navbar display. 

5 files changed, 13 insertions, 26 deletions

diff --git a/Peli-Kiera/static/css/main.css b/Peli-Kiera/static/css/main.css
index 571f508..f1ad72c 100644
--- a/Peli-Kiera/static/css/main.css
+++ b/Peli-Kiera/static/css/main.css
@@ -89,11 +89,17 @@ time {
 }
 
 #container nav ul li {
+  display: flex;
   margin-left: 1em;
+  align-items: end;
+}
+#container nav ul li a {
+  line-height: 1.4em;
 }
 
 #container nav ul li a.active {
-  border-bottom: 0.5em solid #666666;
+  border-bottom: 0.2em solid #666666;
+  line-height: 1.4em;
 }
 
 #container main {
diff --git a/Peli-Kiera/templates/analytics.html b/Peli-Kiera/templates/analytics.html
index a966c4c..1f9f029 100644
--- a/Peli-Kiera/templates/analytics.html
+++ b/Peli-Kiera/templates/analytics.html
@@ -5,7 +5,7 @@
     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
     })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
-    ga('create', '{{GOOGLE_ANALYTICS}}', '{{GA_COOKIE_DOMAIN if GA_COOKIE_DOMAIN else 'auto'}}');
+    ga('create', '{{GOOGLE_ANALYTICS}}', '{{GA_COOKIE_DOMAIN if GA_COOKIE_DOMAIN else "auto"}}');
     ga('send', 'pageview');
     </script>
 {% endif %}
@@ -24,22 +24,3 @@
     })();
     </script>
 {% endif %}
-{% if PIWIK_URL and PIWIK_SITE_ID %}
-    <script type="text/javascript">
-    {% if PIWIK_SSL_URL %}
-        var pkBaseURL = "{{ PIWIK_SSL_URL }}";
-    {% else %}
-        var pkBaseURL = "{{ PIWIK_URL }}";
-    {% endif %}
-    var _paq = _paq || [];
-    _paq.push(["trackPageView"]);
-    _paq.push(["enableLinkTracking"]);
-    (function() {
-        var u=(("https:" == document.location.protocol) ? "https" : "http")+"://"+pkBaseURL+"/";
-        _paq.push(["setTrackerUrl", u+"piwik.php"]);
-        _paq.push(["setSiteId", "{{ PIWIK_SITE_ID }}"]);
-        var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-        g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-    })();
-    </script>
-{% endif %}
diff --git a/Peli-Kiera/templates/article.html b/Peli-Kiera/templates/article.html
index c9523a2..eaf9762 100644
--- a/Peli-Kiera/templates/article.html
+++ b/Peli-Kiera/templates/article.html
@@ -13,7 +13,7 @@
 {% block content %}
 <main>
     <article>
-        <h2>{{ article.title }}</h2>
+        <h1>{{ article.title }}</h1>
         {% import 'translations.html' as translations with context %}
         {{ translations.translations_for(article) }}
         <aside>
diff --git a/Peli-Kiera/templates/base.html b/Peli-Kiera/templates/base.html
index 3fa7b39..33a4a4d 100644
--- a/Peli-Kiera/templates/base.html
+++ b/Peli-Kiera/templates/base.html
@@ -7,7 +7,7 @@
         <meta http-equiv="X-UA-Compatible" content="ie=edge">
         <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css"/>
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.14.0/css/all.css"/>
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css"/>
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Slab|Ruda"/>
         <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}"/>
         {% if FEED_ALL_ATOM %}
diff --git a/Peli-Kiera/templates/index.html b/Peli-Kiera/templates/index.html
index 8a6e379..b73fa39 100644
--- a/Peli-Kiera/templates/index.html
+++ b/Peli-Kiera/templates/index.html
@@ -5,8 +5,8 @@
             <ul>
                 {% for article in articles_page.object_list %}
                     <li>
-                        <h2><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
-                               title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
+                        <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
+                               title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
                         <aside>
                             <ul>
                                 <li>
@@ -31,4 +31,4 @@
             {% endif %}
         </section>
     </main>
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}