commit...

soprun · Nov 25, 2023 · 95f5dad · 95f5dad
1 parent ccdb321
commit 95f5dad
Show file tree

Hide file tree

Showing 17 changed files with 130 additions and 255 deletions.
diff --git a/404.html b/404.html
@@ -1,14 +1,17 @@
 ---
-layout: default
-title: Page not found! 😨
+layout: page
+title: Страница не найдена! 😨
 noindex: true
 ---
-<meta http-equiv="refresh" content="3;url={{ site.url | absolute_url }}" />
+<meta name="robots" content="noindex, nofollow"/>
+<meta http-equiv="refresh" content="3;url={{ site.url | absolute_url }}"/>
 
-## 404 - Page not found!  😨
+<h2>404 - Page not found! 😨</h2>
 
-We could not find what you were looking for.
-
-Would you like to visit our homepage instead?
-
-[Go back to the home page 🏡]({{ site.url | relative_url }}).
+<p>Мы не смогли найти то, что вы искали.</p>
+<p>Хотели бы вы вместо этого посетить нашу домашнюю страницу?
+    <br>
+    <a href="{{ site.url | relative_url }}">
+        Вернитесь на домашнюю страницу 🏡
+    </a>
+</p>
diff --git a/_config.yml b/_config.yml
@@ -283,22 +283,12 @@ defaults:
       layout: page
       title: ~
       description: ~
-      page_title: false
-      page_show_image: false
-      show_title_link: true
       type: page
+      image: /assets/img/about.jpeg
       noindex: false
       paginate: false
       published: true
       tags: [ ]
-      lang: ~
-      #      date: "2023-01-31 00:56:00 +0300"
-      author:
-        name: ~
-        url: ~
-        email: ~
-        avatar: ~
-      image: https://images.unsplash.com/photo-1488722796624-0aa6f1bb6399?w=400&fit=crop&fm=webp&auto=compress
       categories: [ ]
 
   - scope:

diff --git a/_data/navigation.yml b/_data/navigation.yml
@@ -1,8 +1,8 @@
--   name: Обо мне
-    link: /about
-    rel: author
-    icon: <i class="fa-solid fa-image-user" aria-hidden="true"></i>
-    disabled: false
+#-   name: Обо мне
+#    link: /about
+#    rel: author
+#    icon: <i class="fa-solid fa-image-user" aria-hidden="true"></i>
+#    disabled: false
 
 #-   name: Блог
 #    link: /blog

diff --git a/_includes/header.liquid b/_includes/header.liquid
@@ -5,12 +5,12 @@
 
     <nav class="navbar navbar-expand-md navbar-light fixed-top bg-light">
         <div class="container-lg">
-            <a class="navbar-brand" href="{{ site_url }}">
-                <img src="{{ site.logo | relative_url }}"
-                     width="30"
-                     height="30"
-                     class="d-inline-block align-top rounded-circle"
-                     alt="{{ site.title | escape }}">
+            <a class="navbar-brand" href="{{ site_url }}" rel="home">
+                {% comment %}<img src="{{ site.logo | relative_url }}"{% endcomment %}
+                {% comment %}width="30"{% endcomment %}
+                {% comment %}height="30"{% endcomment %}
+                {% comment %}class="d-inline-block align-top rounded-circle"{% endcomment %}
+                {% comment %}alt="{{ site.title | escape }}">{% endcomment %}
                 {{ site.short_title }}
             </a>
             <button class="navbar-toggler"

diff --git a/_layouts/blank.liquid b/_layouts/blank.liquid
diff --git a/_layouts/default.liquid b/_layouts/default.liquid
@@ -1,6 +1,6 @@
 {%- include variables.liquid -%}
 <!DOCTYPE html>
-<html lang="{{ page.lang | default: site.lang | default: 'ru' }}">
+<html lang="{{ page.lang | default: site.lang }}">
 {%- include head.liquid %}
 <body class="{{ page.layout }}">
 {%- include head/google-tag-manager-body.liquid -%}

diff --git a/_layouts/article.liquid → _layouts/old/article.liquid b/_layouts/article.liquid → _layouts/old/article.liquid
diff --git a/_layouts/crossref.xml → _layouts/old/crossref.xml b/_layouts/crossref.xml → _layouts/old/crossref.xml
diff --git a/_layouts/home-card.liquid → _layouts/old/home-card.liquid b/_layouts/home-card.liquid → _layouts/old/home-card.liquid
diff --git a/_layouts/home.liquid → _layouts/old/home.liquid b/_layouts/home.liquid → _layouts/old/home.liquid
diff --git a/_layouts/old/page.liquid b/_layouts/old/page.liquid
@@ -0,0 +1,37 @@
+---
+layout: default
+---
+<article class="page">
+    {% include snippet/post/post-thumbnail.liquid
+        src=page.image
+        alt=page.title
+        param='?w=942&h=218&fit=crop'
+    %}
+    <header class="page-header">
+        {% if page.page_title %}
+            {% include snippet/post/post-title.liquid
+                title=page.page_title
+                url=page.url
+            %}
+        {% else %}
+            {% include snippet/post/post-title.liquid
+                title=page.title
+                url=page.url
+            %}
+        {% endif %}
+        {% include snippet/post/post-meta.liquid
+            date=page.date
+            content=page.content
+            modified_date=page.modified_date
+        %}
+        {% include snippet/post/post-tags.liquid
+            tags=page.tags
+        %}
+        {% include snippet/post/post-categories.liquid
+            categories=page.categories
+        %}
+    </header>
+    <div class="page-content">
+        {{ content }}
+    </div>
+</article>
diff --git a/_layouts/post.liquid → _layouts/old/post.liquid b/_layouts/post.liquid → _layouts/old/post.liquid
diff --git a/_layouts/tailwindui.liquid → _layouts/old/tailwindui.liquid b/_layouts/tailwindui.liquid → _layouts/old/tailwindui.liquid
diff --git a/_layouts/page.liquid b/_layouts/page.liquid
@@ -1,37 +1,7 @@
 ---
 layout: default
 ---
-<article class="page">
-    {% include snippet/post/post-thumbnail.liquid
-        src=page.image
-        alt=page.title
-        param='?w=942&h=218&fit=crop'
-    %}
-    <header class="page-header">
-        {% if page.page_title %}
-            {% include snippet/post/post-title.liquid
-                title=page.page_title
-                url=page.url
-            %}
-        {% else %}
-            {% include snippet/post/post-title.liquid
-                title=page.title
-                url=page.url
-            %}
-        {% endif %}
-        {% include snippet/post/post-meta.liquid
-            date=page.date
-            content=page.content
-            modified_date=page.modified_date
-        %}
-        {% include snippet/post/post-tags.liquid
-            tags=page.tags
-        %}
-        {% include snippet/post/post-categories.liquid
-            categories=page.categories
-        %}
-    </header>
-    <div class="page-content">
-        {{ content }}
-    </div>
-</article>
+
+{% comment %}{{ page | jsonify }}{% endcomment %}
+
+{{ content }}
diff --git a/about.html b/about.html