Merge 9ce71a0f59 into 01f9e43e59

assets/sass/components/_tab.scss

@@ -26,12 +26,12 @@
 
     @include themify($themes) {
       color: themed('navbar-title-color');
-      background-color: themed('body-background-color');
+      background-color: themed('tab-link-background-color');
       border: none;
       border-bottom: 1px solid themed('hr-color');
 
       &.active {
-        background-color: themed('body-background-color');
+        background-color: themed('tab-link-active-background-color');
         border: 1px solid themed('hr-color');
         border-bottom: none;
       }

assets/sass/themes/_dark.scss

@@ -107,4 +107,6 @@ $dark: (
     share-background-color: lighten(#403E41, 2.5%),
     donation-background-color: #525252,
     button-primary-color: $button_dark_primary_color,
+    tab-link-background-color: lighten(#2D2A2E, 5%),
+    tab-link-active-background-color: lighten(#2D2A2E, 20%),
 );

assets/sass/themes/_hacker.scss

@@ -107,4 +107,6 @@ $hacker: (
     share-background-color: #383b4c,
     donation-background-color: #43454d,
     button-primary-color: $button_hacker_primary_color,
+    tab-link-background-color: lighten(#151715, 5%),
+    tab-link-active-background-color: lighten(#151715, 20%),
 );

assets/sass/themes/_kimbie.scss

@@ -106,4 +106,6 @@ $kimbie: (
   share-background-color: #403c38,
   donation-background-color: #52493c,
   button-primary-color: $button_kimbie_primary_color,
+  tab-link-background-color: lighten(#221a0f, 5%),
+  tab-link-active-background-color: lighten(#221a0f, 20%),
 );

assets/sass/themes/_light.scss

@@ -106,4 +106,6 @@ $light: (
     share-background-color: #90a4ae,
     donation-background-color: #eceff1,
     button-primary-color: $button_light_primary_color,
+    tab-link-background-color: darken(#fafafa, 2%),
+    tab-link-active-background-color: darken(#fafafa, 10%),
 );

assets/sass/themes/_solarized.scss

@@ -106,4 +106,6 @@ $solarized: (
     share-background-color: #99907a,
     donation-background-color: #c5e0df,
     button-primary-color: $button_solarized_primary_color,
+    tab-link-background-color: darken(#FDF7E3, 5%),
+    tab-link-active-background-color: darken(#FDF7E3, 20%),
 );

layouts/partials/navbar/site-nav.html

@@ -1,14 +1,14 @@
 <nav class="navbar scrolling" role="navigation" aria-label="main navigation" data-dir="{{ if $.Param "navbardir" }}{{ $.Param "navbardir" }}{{ else }}{{ $.Param "languagedir" | default "ltr" }}{{ end }}">
   <div class="navbar__brand">
     {{ if $.Param "logo" | default true }}
-    <a href="{{ "/" | relLangURL }}" title="{{ i18n "tooltip-home" }}" rel="home" class="{{ if eq ($.Param "logoType") "long" }}navbar__long-link{{ else }}navbar__logo-link{{ end }}">
+    <a href="{{ "" | relLangURL }}" title="{{ i18n "tooltip-home" }}" rel="home" class="{{ if eq ($.Param "logoType") "long" }}navbar__long-link{{ else }}navbar__logo-link{{ end }}">
-      <img src="{{ "/logo.png" | relURL }}" alt="Home" class="navbar__logo">
+      <img src="{{ "logo.png" | relURL }}" alt="Home" class="navbar__logo">
     </a>
     {{ else }}
     &nbsp;&nbsp;
     {{ end }}
     {{ if ne .Site.Params.logoType "long" }}
-      <a href="{{ "/" | relLangURL }}" title="{{ i18n "tooltip-home" }}" rel="home" class="navbar__title-link">
+      <a href="{{ "" | relLangURL }}" title="{{ i18n "tooltip-home" }}" rel="home" class="navbar__title-link">
         <h6 class="navbar__title">{{ .Site.Params.logoText }}</h6>
       </a>
     {{ end }}

layouts/partials/script/pub-list-script.html

@@ -10,7 +10,7 @@
   var enableSearchHighlight = JSON.parse({{ $enableSearchHighlight | jsonify }});
   {{ $isFirstSection := eq .Permalink .FirstSection.Permalink }}
   var isFirstSection = JSON.parse({{ $isFirstSection | jsonify }});
-  {{ $tagsBaseURL := ("/tags/" | relLangURL) }}
+  {{ $tagsBaseURL := ("tags/" | relLangURL) }}
   var tagsBaseURL = JSON.parse({{ $tagsBaseURL | jsonify }});
   
   document.addEventListener('DOMContentLoaded', function () {

layouts/partials/taxonomy/taxonomy-categories.html

@@ -2,7 +2,7 @@
 <div class="taxo">
     <section>
         <span class="title p2">
-            <a href="{{ "/categories/" | relLangURL }}" class="taxo__title">
+            <a href="{{ "categories/" | relLangURL }}" class="taxo__title">
                 {{ i18n "categories" }}
             </a>
         </span>

layouts/partials/taxonomy/taxonomy-series.html

@@ -2,7 +2,7 @@
 <div class="taxo">
     <section>
         <span class="title p2">
-            <a href="{{ "/series/" | relLangURL }}" class="taxo__title">
+            <a href="{{ "series/" | relLangURL }}" class="taxo__title">
                 {{ i18n "series" }}
             </a>
         </span>

layouts/partials/taxonomy/taxonomy-tags.html

@@ -2,7 +2,7 @@
 <div class="taxo">
     <section>
         <span class="title p2">
-            <a href="{{ "/tags/" | relLangURL }}" class="taxo__title">
+            <a href="{{ "tags/" | relLangURL }}" class="taxo__title">
                 {{ i18n "tags"}}
             </a>
         </span>