Merge branch 'master' into master

2025-04-29 03:53:30 +08:00 · 2022-06-05 17:54:53 +02:00 · 2022-06-05 17:54:53 +02:00 · b7d4bee388
commit b7d4bee388
parent c2ea156a31 5e350b92e8
26 changed files with 63 additions and 59 deletions
--- a/assets/scss/general.scss
+++ b/assets/scss/general.scss
@ -0,0 +1,31 @@
+a {
+    text-decoration: none;
+    color: var(--accent-color);
+
+    &:hover {
+        color: var(--accent-color-darker);
+    }
+
+    &.link {
+        box-shadow: 0px -2px 0px rgba(var(--link-background-color), var(--link-background-opacity)) inset;
+        transition: all 0.3s ease;
+
+        &:hover {
+            box-shadow: 0px calc(-1rem * var(--article-line-height)) 0px rgba(var(--link-background-color), var(--link-background-opacity-hover)) inset;
+        }
+    }
+}
+
+.section-title {
+    text-transform: uppercase;
+    margin-top: 0;
+    margin-bottom: 10px;
+    display: block;
+    font-size: 1.6rem;
+    font-weight: bold;
+    color: var(--body-text-color);
+
+    a {
+        color: var(--body-text-color);
+    }
+}
--- a/assets/scss/partials/layout/article.scss
+++ b/assets/scss/partials/layout/article.scss
@ -166,7 +166,7 @@
    }
 }

-.related-contents {
+.related-content {
    overflow-x: auto;
    padding-bottom: 15px;

--- a/assets/scss/style.scss
+++ b/assets/scss/style.scss
@ -24,36 +24,5 @@
@import "partials/layout/404.scss";
@import "partials/layout/search.scss";

+@import "general.scss";
@import "custom.scss";
-
-a {
-    text-decoration: none;
-    color: var(--accent-color);
-
-    &:hover {
-        color: var(--accent-color-darker);
-    }
-
-    &.link {
-        box-shadow: 0px -2px 0px rgba(var(--link-background-color), var(--link-background-opacity)) inset;
-        transition: all 0.3s ease;
-
-        &:hover {
-            box-shadow: 0px -10px 0px rgba(var(--link-background-color), var(--link-background-opacity-hover)) inset;
-        }
-    }
-}
-
-.section-title {
-    text-transform: uppercase;
-    margin-top: 0;
-    margin-bottom: 10px;
-    display: block;
-    font-size: 1.6rem;
-    font-weight: bold;
-    color: var(--body-text-color);
-
-    a {
-        color: var(--body-text-color);
-    }
-}
--- a/i18n/ar.yaml
+++ b/i18n/ar.yaml
@ -23,7 +23,7 @@ article:
    tableOfContents:
        other: جدول المحتويات

-    relatedContents:
+    relatedContent:
        other: محتوى مشابهه
        
    lastUpdatedOn:
--- a/i18n/ca.yaml
+++ b/i18n/ca.yaml
@ -23,7 +23,7 @@ article:
    tableOfContents:
        other: Taula de contingut

-    relatedContents:
+    relatedContent:
        other: Continguts relacionats

    lastUpdatedOn:
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@ -23,7 +23,7 @@ article:
    tableOfContents:
        other: Inhaltsverzeichnis

-    relatedContents:
+    relatedContent:
        other: Verwandte Inhalte

    lastUpdatedOn:
@ -52,6 +52,10 @@ widget:
        title:
            other: Schlagwörter

+    categoriesCloud:
+        title:
+            other: Kategorien
+
 search:
    title:
        other: Suche
--- a/i18n/el.yaml
+++ b/i18n/el.yaml
@ -23,7 +23,7 @@ article:
    tableOfContents:
        other: Πινακας περιεχομενων

-    relatedContents:
+    relatedContent:
        other: Σχετικο περιεχομενο

    lastUpdatedOn:
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@ -23,8 +23,8 @@ article:
    tableOfContents:
        other: Table of contents

-    relatedContents:
-        other: Related contents
+    relatedContent:
+        other: Related content

    lastUpdatedOn:
        other: Last updated on
--- a/i18n/es.yaml
+++ b/i18n/es.yaml
@ -23,7 +23,7 @@ article:
    tableOfContents:
        other: Tabla de contenido

-    relatedContents:
+    relatedContent:
        other: Contenidos relacionados

    lastUpdatedOn:
--- a/i18n/fr.yaml
+++ b/i18n/fr.yaml
@ -23,7 +23,7 @@ article:
    tableOfContents:
        other: Table des matières

-    relatedContents:
+    relatedContent:
        other: Contenus liés

    lastUpdatedOn:
--- a/i18n/id.yaml
+++ b/i18n/id.yaml
@ -23,7 +23,7 @@ article:
    tableOfContents:
        other: Daftar Isi

-    relatedContents:
+    relatedContent:
        other: Konten terkait

    lastUpdatedOn:
--- a/i18n/it.yaml
+++ b/i18n/it.yaml
@ -23,7 +23,7 @@ article:
    tableOfContents:
        other: Indice

-    relatedContents:
+    relatedContent:
        other: Contenuti correlati

    lastUpdatedOn:
--- a/i18n/ja.yaml
+++ b/i18n/ja.yaml
@ -11,7 +11,7 @@ article:
    tableOfContents:
        other: 目次

-    relatedContents:
+    relatedContent:
        other: 関連するコンテンツ

    lastUpdatedOn:
--- a/i18n/ko.yaml
+++ b/i18n/ko.yaml
@ -23,7 +23,7 @@ article:
    tableOfContents:
        other: 목차
        
-    relatedContents:
+    relatedContent:
        other: 관련 글
        
    lastUpdatedOn:
--- a/i18n/nl.yaml
+++ b/i18n/nl.yaml
@ -17,7 +17,7 @@ list:
        other: Subsecties

 article:
-    relatedContents:
+    relatedContent:
        other: Gerelateerde inhoud
    lastUpdatedOn:
        other: Laatst bijgewerkt op
--- a/i18n/pl.yaml
+++ b/i18n/pl.yaml
@ -23,7 +23,7 @@ article:
    tableOfContents:
        other: Spis treści

-    relatedContents:
+    relatedContent:
        other: Powiązane artykuły

    lastUpdatedOn:
--- a/i18n/pt-br.yaml
+++ b/i18n/pt-br.yaml
@ -23,7 +23,7 @@ article:
    tableOfContents:
        other: Índice

-    relatedContents:
+    relatedContent:
        other: Conteúdo relacionado

    lastUpdatedOn:
--- a/i18n/ru.yaml
+++ b/i18n/ru.yaml
@ -23,7 +23,7 @@ list:
 article:
    back:
        other: Назад
-    relatedContents:
+    relatedContent:
        other: Также рекомендуем
    lastUpdatedOn:
        other: Обновлено
--- a/i18n/th.yaml
+++ b/i18n/th.yaml
@ -23,7 +23,7 @@ article:
    tableOfContents:
        other: สารบัญ

-    relatedContents:
+    relatedContent:
        other: เนื้อหาคล้ายคลึงกัน

    lastUpdatedOn:
--- a/i18n/tr.yaml
+++ b/i18n/tr.yaml
@ -17,7 +17,7 @@ list:
        other: Alt bölümler

 article:
-    relatedContents:
+    relatedContent:
        other: Alakalı içerikler
    lastUpdatedOn:
        other: Son güncelleme
--- a/i18n/uk.yaml
+++ b/i18n/uk.yaml
@ -24,7 +24,7 @@ article:
    tableOfContents:
        other: Зміст

-    relatedContents:
+    relatedContent:
        other: Схожі матеріали

    lastUpdatedOn:
--- a/i18n/zh-cn.yaml
+++ b/i18n/zh-cn.yaml
@ -11,7 +11,7 @@ article:
    tableOfContents:
        other: 目录

-    relatedContents:
+    relatedContent:
        other: 相关文章

    lastUpdatedOn:
--- a/i18n/zh-hk.yaml
+++ b/i18n/zh-hk.yaml
@ -23,7 +23,7 @@ article:
    tableOfContents:
        other: 目錄

-    relatedContents:
+    relatedContent:
        other: 相關內容

    lastUpdatedOn:
--- a/i18n/zh-tw.yaml
+++ b/i18n/zh-tw.yaml
@ -11,7 +11,7 @@ article:
    tableOfContents:
        other: 目錄

-    relatedContents:
+    relatedContent:
        other: 相關文章

    lastUpdatedOn:
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@ -30,7 +30,7 @@
        {{ partial "article/components/links" . }}
    {{ end }}

-    {{ partial "article/components/related-contents" . }}
+    {{ partial "article/components/related-content" . }}
     
    {{ if not (eq .Params.comments false) }}
        {{ partial "comments/include" . }}
--- a/layouts/partials/article/components/related-contents.html
+++ b/layouts/partials/article/components/related-contents.html
@ -1,8 +1,8 @@
 {{ $related := (where (.Site.RegularPages.Related .) "Params.hidden" "!=" true) | first 5 }}
 {{ with $related }}
-<aside class="related-contents--wrapper">
-    <h2 class="section-title">{{ T "article.relatedContents" }}</h2>
-    <div class="related-contents">
+<aside class="related-content--wrapper">
+    <h2 class="section-title">{{ T "article.relatedContent" }}</h2>
+    <div class="related-content">
        <div class="flex article-list--tile">
            {{ range . }}
                {{ partial "article-list/tile" (dict "context" . "size" "250x150" "Type" "articleList") }}