Merge branch 'master' into canary

assets/scss/partials/article.scss

@@ -92,16 +92,15 @@
 .article-time,
 .article-translations {
     display: flex;
-    align-items: center;
     color: var(--card-text-color-tertiary);
     gap: 15px;
-    flex-wrap: wrap;
 
     svg {
         vertical-align: middle;
         width: 20px;
         height: 20px;
         stroke-width: 1.33;
+        flex-shrink: 0;
     }
 
     time,
@@ -117,6 +116,16 @@
     }
 }
 
+.article-time {
+    flex-wrap: wrap;
+}
+
+.article-translations {
+    & > div {
+        flex-wrap: wrap;
+    }
+}
+
 .article-category,
 .article-tags {
     display: flex;

assets/scss/partials/layout/article.scss

@@ -264,6 +264,11 @@
         font-family: var(--code-font-family);
     }
 
+    a,
+    code {
+        word-break: break-word;
+    }
+
     .gallery {
         position: relative;
         display: flex;
@@ -430,4 +435,14 @@
         overflow-x: auto;
         overflow-y: hidden;
     }
+
+    kbd {
+        border: 1px solid var(--kbd-border-color);
+        font-weight: bold;
+        font-size: 0.9em;
+        line-height: 1;
+        padding: 2px 4px;
+        border-radius: 4px;
+        display: inline-block;
+    }
 }

assets/scss/partials/sidebar.scss

@@ -83,6 +83,7 @@
 
     @include respond(lg) {
         padding-top: var(--main-top-padding);
+        padding-bottom: var(--main-top-padding);
     }
 }
 

assets/scss/variables.scss

@@ -16,7 +16,7 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff;
     --accent-color: #34495e;
     --accent-color-darker: #2c3e50;
     --accent-color-text: #fff;
-    --body-text-color: #bababa;
+    --body-text-color: #707070;
 
     --tag-border-radius: 4px;
 
@@ -56,7 +56,7 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff;
 
     --card-text-color-main: #000;
     --card-text-color-secondary: #747474;
-    --card-text-color-tertiary: #bababa;
+    --card-text-color-tertiary: #767676;
     --card-separator-color: rgba(218, 218, 218, 0.5);
 
     --card-border-radius: 10px;
@@ -123,6 +123,8 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff;
     --table-border-color: #dadada;
     --tr-even-background-color: #efefee;
 
+    --kbd-border-color: #dadada;
+
     &[data-scheme="dark"] {
         --code-background-color: #272822;
         --code-text-color: rgba(255, 255, 255, 0.9);

assets/ts/search.tsx

@@ -227,6 +227,7 @@ class Search {
             Search.updateQueryString(keywords, true);
 
             if (keywords === '') {
+                lastSearch = '';
                 return this.clear();
             }
 

assets/ts/smoothAnchors.ts

@@ -21,8 +21,8 @@ function setupSmoothAnchors() {
         aElement.addEventListener("click", clickEvent => {
             clickEvent.preventDefault();
 
-            const targetId = aElement.getAttribute("href").substring(1),
-                target = document.getElementById(targetId) as HTMLElement, 
+            const targetId = decodeURI(aElement.getAttribute("href").substring(1)),
+                target = document.getElementById(targetId) as HTMLElement,
                 offset = target.getBoundingClientRect().top - document.documentElement.getBoundingClientRect().top;
 
             window.history.pushState({}, "", aElement.getAttribute("href"));