Many style fixes

2019-07-01 18:29:11 +02:00 · 2019-07-01 18:29:11 +02:00 · 613e17129c
parent d237275171
commit 613e17129c
7 changed files with 68 additions and 61 deletions
--- a/config.toml
+++ b/config.toml
@ -9,7 +9,6 @@ default_language = "en"
 compile_sass = true
 highlight_code = true
 highlight_theme = "1337" # or: boron
-insert_anchor_links = true
 generate_rss = true
 build_search_index = true
 # check_external_links = true
@ -27,17 +26,6 @@ zenn_menu = [
    {url = "$BASE_URL", name = "Home"},
    {url = "$BASE_URL/projects", name = "Projects"},
    {url = "$BASE_URL/blog", name = "Blog"},
-    {url = "$BASE_URL/categories", name = "Categories"},
-    {url = "$BASE_URL/tags", name = "Tags"},
    {url = "$BASE_URL/about", name = "About"},
-    {url = "https://timvisee.com", name = "timvisee.com"},
 ]
 zenn_source = "https://gitlab.com/timvisee/blog.timvisee.com/"
-
-after_dark_title = "Tim Visée"
-after_dark_menu = [
-    {url = "$BASE_URL", name = "Home"},
-    {url = "$BASE_URL/projects", name = "Projects"},
-    {url = "$BASE_URL/blog", name = "Blog"},
-    {url = "$BASE_URL/about", name = "About"},
-]
--- a/content/projects.md
+++ b/content/projects.md
@ -5,5 +5,4 @@ description = "Projects index"

 This page lists some of the projects I've developed over time.

- [Bukkit projects](/projects/bukkit)  
-  _CraftBukkit plugins_
+- [Bukkit projects](/projects/bukkit):  _CraftBukkit plugins_
--- a/content/projects/bukkit.md
+++ b/content/projects/bukkit.md
@ -3,4 +3,4 @@ title = "Bukkit projects"
 description = "Bukkit projects index"
 +++

- [Dungeon Maze](bukkit/dungeon-maze/)
+- [Dungeon Maze](@/projects/bukkit/dungeon-maze.md)
--- a/themes/zenn/sass/site.scss
+++ b/themes/zenn/sass/site.scss
@ -15,11 +15,11 @@ $font-monospace: "Fira Mono", monospace;
 $font-logo: "Source Sans Pro", Helvetica, sans-serif;

 // Setup the function in your functions or helpers files, wherever you keep these bits.
-@function headings($from:1, $to:6) {
+@function headings($from:1, $to:6, $prefix:"") {
    @if $from == $to {
-        @return 'h#{$from}';
+        @return $prefix + ' h#{$from}';
    } @else {
-        @return 'h#{$from},' + headings($from+1, $to);
+        @return $prefix + 'h#{$from},' + headings($from+1, $to, $prefix);
    }
 }

@ -94,19 +94,19 @@ a {
    }
 }

-body > header {
+body > header#banner {
    text-align: center;
    margin: 0.5em 0;
 }
@media (max-width: 400px) {
-    body > header {
+    body > header#banner {
        margin-top: 1em;
        min-height: auto;
        background: none
    }
 }

-body > header .logo {
+body > header#banner .logo {
    display: inline-block;
    margin: 0.5em 0;
    overflow: visible;
@ -128,11 +128,11 @@ body > header .logo {
    padding: 1rem 1.75rem;
    text-transform: uppercase;
 }
-body > header .logo:hover {
+body > header#banner .logo:hover {
    border-color: $logo-color-hover !important;
    color: $logo-color-hover !important;
 }
-body > header .logo:active {
+body > header#banner .logo:active {
    border-color: $logo-color-hover !important;
    color: $logo-color-hover !important;
    background-color: rgba($logo-color-hover, 0.2) !important;
@ -164,10 +164,17 @@ content {
        padding: 2.5em 1em;
    }
 }
-content > #{headings(1,6)} {
+
+content > header {
+    margin: 0;
+    padding-bottom: 1em;
+    border-bottom: 1px dashed $background-border;
+}
+
+#{headings(1,6,"content header >")} {
    margin: 0;
    padding-bottom: 0.3em;
-    border-bottom: 1px dashed $background-border;
+    border-bottom: 0;
 }

 content pre,
@ -215,12 +222,14 @@ sidebar {
    }
 }

-sidebar h1 {
-    font-size: 1.4em;
-}
-sidebar #{headings(1,6)} {
-    margin: 0;
-    padding-bottom: 0.3em;
+sidebar {
+    h1 {
+        font-size: 1.4em;
+    }
+    #{headings(1,6)} {
+        margin: 0;
+        padding-bottom: 0.3em;
+    }
 }

 sidebar > section {
@ -264,7 +273,7 @@ article {
 }

 article.single {
-    border-bottom: 0;
+    padding: 0.5em 0;
 }

 article > header {
@ -298,6 +307,9 @@ sidebar .tag {
 p {
    line-height: 1.5;
 }
+p#zola-continue-reading {
+    height: 0px;
+}

 footer {
    font-family: $font-title;
--- a/themes/zenn/templates/index.html
+++ b/themes/zenn/templates/index.html
@ -5,16 +5,20 @@
    {% for page in paginator.pages %}
        {{ post_macros::page_in_list(page=page) }}
    {% endfor %}
-
-    <nav>
-        <p class="muted">
-            {% if paginator.previous %}
-            <a href="{{ paginator.previous }}">&laquo; Previous</a> &middot;
-            {% endif %}
-            Page {{ paginator.current_index }} of {{ paginator.number_pagers }}
-            {% if paginator.next %}
-            &middot; <a href="{{ paginator.next }}">Next &raquo;</a>
-            {% endif %}
-        </p>
-    </nav>
 {% endblock body %}
+
+{% block page_footer %}
+    <footer class="muted">
+        <nav>
+            <p class="muted">
+                {% if paginator.previous %}
+                <a href="{{ paginator.previous }}">&laquo; Previous</a> &middot;
+                {% endif %}
+                Page {{ paginator.current_index }} of {{ paginator.number_pagers }}
+                {% if paginator.next %}
+                &middot; <a href="{{ paginator.next }}">Next &raquo;</a>
+                {% endif %}
+            </p>
+        </nav>
+    </footer>
+{% endblock page_footer %}
--- a/themes/zenn/templates/page.html
+++ b/themes/zenn/templates/page.html
@ -5,7 +5,7 @@
 {% endblock header_meta %}

 {% block body %}
-    <article itemscope itemtype="http://schema.org/BlogPosting">
+    <article class="single" itemscope itemtype="http://schema.org/BlogPosting">
        {#
        <header>
            <h1 itemprop="headline">{{ page.title }}</h1>
--- a/themes/zenn/templates/site.html
+++ b/themes/zenn/templates/site.html
@ -38,7 +38,7 @@
    <body>
        {% if config.extra.zenn_title %}
            {% block header %}
-                <header>
+                <header id="banner">
                    <a href="/" class="logo">{{ config.extra.zenn_title }}</a>
                </header>
            {% endblock header %}
@ -48,26 +48,30 @@
            <main>
                <content>
                    {% if section.title %}
-                        <h1>
-                            {{ section.title }}
-
-                            {% if paginator %}
-                                {% if paginator.current_index > 1 %}
-                                    &nbsp;&middot;&nbsp; Page {{ paginator.current_index }}
+                        <header>
+                            <h1>
+                                {{ section.title }}
+                                {% if paginator %}
+                                    {% if paginator.current_index > 1 %}
+                                        &nbsp;&middot;&nbsp; Page {{ paginator.current_index }}
+                                    {% endif %}
                                {% endif %}
-                            {% endif %}
+                                {% include "anchor-link.html" %}
+                            </h1>

-                            {% include "anchor-link.html" %}
-                        </h1>
+                            {% block header_meta %}{% endblock header_meta %}
+                        </header>
                    {% endif %}
                    {% if page.title %}
-                        <h1>
-                            {{ page.title }}
+                        <header>
+                            <h1>
+                                {{ page.title }}
+                                {% include "anchor-link.html" %}
+                            </h1>

-                            {% include "anchor-link.html" %}
-                        </h1>
+                            {% block header_meta %}{% endblock header_meta %}
+                        </header>
                    {% endif %}
-                    {% block header_meta %}{% endblock header_meta %}

                    {% block body %}{% endblock body %}

@ -78,7 +82,7 @@
                        <section>
                            <nav itemscope itemtype="http://schema.org/SiteNavigationElement">
                                <ul>
-                                    {% for item in config.extra.after_dark_menu %}
+                                    {% for item in config.extra.zenn_menu %}
                                        <li>
                                            <a itemprop="url"
                                            class="{% if item.url | replace(from="$BASE_URL", to=config.base_url) == current_url %}active{% endif %}"