aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaroslav de la Peña Smirnov <yps@yaroslavps.com>2022-10-06 04:54:57 +0300
committerYaroslav de la Peña Smirnov <yps@yaroslavps.com>2022-10-06 04:54:57 +0300
commit0a88ade33bff3f714e701f8c4b210e824c3d231d (patch)
tree5b5f28e287a22ebb963f479d1872603101516bba
parentc7cae0942d6cbc5efbf186fdbf6ea3c614a4f762 (diff)
downloadyaroslavps.com-0a88ade33bff3f714e701f8c4b210e824c3d231d.tar.gz
yaroslavps.com-0a88ade33bff3f714e701f8c4b210e824c3d231d.zip
CSS and templates revamp
Had been thinking for a long while (prob about 2y now) that I wanted for there to be no distractions while reading the content (i.e. no sidebar). Didn't know how to handle navigation, though. Have made a lot of changes and am actually pretty satisfied with the results. Looks much cleaner now, and for those who know how to use browsers is actually more comfortable, since you can just press the end key and you are taken to the footer where all the navigation is. Of course, where it is relevant there are some navigation links at the top of the page. Phone users have it a little more uncomfortable, but phone usage overall has and always will be uncomfy. Such is the nature of small touch screens.
-rw-r--r--config.toml12
-rw-r--r--sass/css/_colors.scss2
-rw-r--r--sass/css/yaroslavps.scss186
-rw-r--r--templates/base.html163
-rw-r--r--templates/food_archive.html25
-rw-r--r--templates/index.html405
-rw-r--r--templates/page.html33
-rw-r--r--templates/weblog.html63
-rw-r--r--templates/weblog_archive.html25
9 files changed, 450 insertions, 464 deletions
diff --git a/config.toml b/config.toml
index bd3fa77..60d6489 100644
--- a/config.toml
+++ b/config.toml
@@ -36,8 +36,11 @@ recipes="Recipe book"
photos="Photo gallery"
other_links="Other links"
see_more="See more..."
-homepage="Home page"
+homepage="Home"
archive="Archive"
+back_home="Back to homepage"
+leave_tip="Leave a tip"
+latest_posts="Latest entries"
[languages.es]
generate_feed = false
@@ -61,6 +64,9 @@ other_links="Otros vínculos"
see_more="Ver más..."
homepage="Inicio"
archive="Archivo"
+back_home="Regresar al inicio"
+leave_tip="Dejar propina"
+latest_posts="Entradas recientes"
[languages.ru]
generate_feed = false
@@ -84,4 +90,6 @@ other_links="Другие ссылки"
see_more="Смотреть больше..."
homepage="Главная"
archive="Архив"
-
+back_home="Вернуться на главную"
+leave_tip="Оставить чаевые"
+latest_posts="Последние записи"
diff --git a/sass/css/_colors.scss b/sass/css/_colors.scss
index e633b53..f3667bb 100644
--- a/sass/css/_colors.scss
+++ b/sass/css/_colors.scss
@@ -1,6 +1,6 @@
$bg0: #000000;
$bg1: #0a0a0f;
-$white: #e5e9f0;
+$white: #fcf8e2;
$gray: #7c818c;
$gray1: #5c5c64;
$red: #b73030;
diff --git a/sass/css/yaroslavps.scss b/sass/css/yaroslavps.scss
index ff9c239..df76b80 100644
--- a/sass/css/yaroslavps.scss
+++ b/sass/css/yaroslavps.scss
@@ -13,9 +13,6 @@ html, body {
min-height: 100vh;
font-size: 14px;
background: $bg0;
- // background: linear-gradient(to left, #000, #18214a 30%, #18214a 70%, #000);
- // background: #000 repeat center fixed url("/img/grid.png");
- // background-size: auto, 20%;
}
ul,
@@ -35,6 +32,23 @@ p {
line-height: 1.4;
font-family: $font_mono;
}
+.new-year,
+h1 {
+ color: $red;
+ font-family: $font_serif;
+ font-variant-caps: small-caps;
+ font-weight: 500;
+ font-size: 2.5em;
+}
+
+h2 {
+ font-size: 1.7em;
+}
+
+h3 {
+ font-size: 1.5em;
+}
+
h2,
h3,
@@ -55,7 +69,7 @@ h3,
h4,
h5,
h6 {
- color: $red1;
+ color: $white;
}
a, a:visited {
@@ -67,23 +81,6 @@ a:hover:visited {
color: $cyan;
}
-.new-year,
-h1 {
- color: $red;
- font-family: $font_serif;
- font-variant-caps: small-caps;
- font-weight: 500;
- font-size: 2.5em;
-}
-
-h2 {
- font-size: 1.8em;
-}
-
-h3 {
- font-size: 1.5em;
-}
-
hr {
border-style: solid;
border-color: $white;
@@ -155,10 +152,7 @@ span.publish-date {
}
.main-container {
- display: grid;
- grid-template-columns: minmax(0, 5fr) 2fr;
- grid-template-rows: min-content;
- max-width: 1180px;
+ max-width: 990px;
margin: 1em auto;
min-height: 90vh;
height: auto;
@@ -166,58 +160,43 @@ span.publish-date {
border-bottom: 1px solid $white;
}
-.landing-page-container {
- grid-column-start: 1;
- grid-column-end: 3;
- padding: 2em;
+.landing-header {
+ text-align: center;
}
-.landing-page-container > h1 {
+.nav-container {
+ padding: 0.2em;
text-align: center;
- font-size: 3em;
+ list-style: none;
}
-.landing-page-container > .links-container {
- padding: 0.5em;
+.nav-container a {
+ background: #000;
}
-.landing-page-container > .links-container > a {
+.nav-container > li {
display: inline-block;
- font-size: 1.5em;
- margin: auto 1em;
}
-.landing-page-container > .links-container > a > span.icon {
- font-size: 1.5em;
+.nav-container > li ~ li::before {
+ display: inline-block;
+ color: $white;
+ content: " · ";
+ margin: 0 0.4em;
+ text-decoration: none;
}
.header-container {
padding: 0 2em;
}
-.landing-page-container,
-.content-container,
-.sidebar-container {
- background-color: $bg0;
-}
-
-.foot-container {
- background: #000 repeat center fixed url("/img/grid.png");
- border-top: 1px solid $white;
-}
-
-.foot-container p {
- display: inline-block;
- background: $bg0;
+.header-container .nav-container {
+ text-align: left;
}
-.foot-container p::after {
- content: '\A';
- white-space: pre;
-}
-
-.sidebar-container {
- border-left: 1px solid $white;
+.content-container {
+ background-color: $bg0;
+ min-height: 90vh;
}
.new-year {
@@ -226,31 +205,6 @@ span.publish-date {
font-size: 2em;
}
-.nav-container {
- text-align: center;
-}
-
-.nav-container > a ~ a::before {
- display: inline-block;
- color: $white;
- content: " · ";
- margin: 0 0.4em;
- text-decoration: none;
-}
-
-.foot-container {
- text-align: center;
- grid-column-start: 1;
- grid-column-end: 3;
- grid-row-start: 3;
- grid-row-end: 3;
- padding: 2em;
-}
-
-.content-container {
- min-height: 90vh;
-}
-
.album-container {
padding: 1em 2em;
}
@@ -264,39 +218,10 @@ span.publish-date {
}
a.see-more {
- display: inline-block;
- text-align: center;
font-weight: bold;
}
-.sidebar-container {
- grid-row-start: 1;
- grid-row-end: 2;
- grid-column-start: 2;
- grid-column-end: 3;
- padding-bottom: 2em;
-}
-
-.sidebar-container span.icon {
- font-size: 2em;
- margin: auto 0.5em;
-}
-
-.sticky-wrapper {
- padding: 1em 2em;
- position: sticky;
- top: 1em;
- max-height: 100vh;
-}
-
-.links-container {
- text-align: center;
-}
-
-.links-container a {
- text-decoration: none;
-}
-
+.landing-container,
.post-container {
padding: 1em 2em;
overflow: auto;
@@ -312,15 +237,11 @@ a.see-more {
display: block;
margin: 0 auto;
max-width: 100%;
- max-height: 40vh;
-}
-
-.post-container img {
- max-width: 100%;
+ max-height: 50vh;
}
.post-container.full img:nth-of-type(1) {
- max-height: 60vh;
+ max-height: 70vh;
}
.footnote-definition {
@@ -364,6 +285,23 @@ pre.literal {
color: $gray;
}
+.foot-container {
+ background: #000 repeat center fixed url("/img/grid.png");
+ border-top: 1px solid $white;
+ text-align: center;
+ padding: 1em;
+}
+
+.foot-container p {
+ display: inline-block;
+ background: $bg0;
+}
+
+.foot-container p::after {
+ content: '\A';
+ white-space: pre;
+}
+
@media (max-width: 768px){
.landing-page-container {
font-size: 1em;
@@ -432,8 +370,12 @@ pre.literal {
border: none;
}
- .sidebar-container {
- display: none;
+ .foot-container p {
+ background: none;
+ }
+
+ .nav-container a {
+ background: none;
}
.header-container,
diff --git a/templates/base.html b/templates/base.html
index 9cad805..9156a8c 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -28,125 +28,60 @@
{% block content %}
{% endblock %}
</div>
- <div class="sidebar-container">
- <div class="sticky-wrapper">
- <h3>{{ trans(key="whats_here", lang=lang) }}</h3>
- <ul class="navigation-list">
- <li>
- {% if lang == "ru" %}
- <a href="/ru/">Главная</a>
- {% elif lang == "es" %}
- <a href="/es/">Inicio</a>
- {% else %}
- <a href="/">Home</a>
- {% endif %}
- <span class="extra-link">[
- {% if lang != "en" %}
- <a href="/">en</a>
- {% endif %}
- {% if lang != "ru" %}
- <a href="/ru/">ru</a>
- {% endif %}
- {% if lang != "es" %}
- <a href="/es/">es</a>
- {% endif %}
- ]</span>
- </li>
- <li>
- {% if lang == "ru" %}
- <a href="/ru/weblog/">Веб-журнал</a>
- {% elif lang == "es" %}
- <a href="/es/weblog/">Weblog</a>
- {% else %}
- <a href="/weblog/">Weblog</a>
- {% endif %}
- <span class="extra-link">[
- {% if lang != "en" %}
- <a href="/weblog">en</a>
- {% endif %}
- {% if lang != "ru" %}
- <a href="/ru/weblog">ru</a>
- {% endif %}
- {% if lang != "es" %}
- <a href="/es/weblog">es</a>
- {% endif %}
- ]</span>
- <ul>
- <li>
- {% if lang == "ru" %}
- <a href="/ru/weblog/archive/">Архив</a>
- {% elif lang == "es" %}
- <a href="/es/weblog/archive/">Archivo</a>
- {% else %}
- <a href="/weblog/archive/">Archive</a>
- {% endif %}
- </li>
- </ul>
- </li>
- <li>
- {% if lang == "ru" %}
- <a href="/ru/food/">Книга рецептов</a>
- {% elif lang == "es" %}
- <a href="/es/food/">Recetario</a>
- {% else %}
- <a href="/food/">Recipe book</a>
- {% endif %}
- <span class="extra-link">[
- {% if lang != "en" %}
- <a href="/food">en</a>
- {% endif %}
- {% if lang != "ru" %}
- <a href="/ru/food">ru</a>
- {% endif %}
- {% if lang != "es" %}
- <a href="/es/food">es</a>
- {% endif %}
- ]</span>
- <ul>
- <li>
- {% if lang == "ru" %}
- <a href="/ru/food/archive/">Архив</a>
- {% elif lang == "es" %}
- <a href="/es/food/archive/">Archivo</a>
- {% else %}
- <a href="/food/archive/">Archive</a>
- {% endif %}
- </li>
- </ul>
- </li>
- </ul>
- <h3>Email</h3>
- <a href="mailto:yps@yaroslavps.com">yps@yaroslavps.com</a>
- <h3>PGP</h3>
- <a href="https://www.yaroslavps.com/files/yaroslavpub.gpg">
- BD900E5D624046DC
- </a>
- {% if lang == "ru" %}
- <p>
- Это русскоязычная версия сайта. Если вам интересно
- прочитать больше, взгляньте на
- <a href="/">англоязычную версию сайта</a>.
- </p>
- {% elif lang == "es" %}
- <p>
- Ésta es la versión en español de mi sitio. Si les
- interesa leer más, denle un vistazo al sitio
- <a href="/">en inglés</a>.
- </p>
- {% endif %}
- </div>
- </div>
{% endblock %}
<div class="foot-container">
- <p>
- The text content in this site is
- <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>,
- the photos are under
- <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">CC BY-NC-SA 4.0</a>.
- </p>
+ <ul class="nav-container" id="foot-nav">
+ <li>
+ <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/">
+ {{ trans(key="homepage", lang=lang) }}
+ </a>
+ </li>
+ <li>
+ <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/weblog/">
+ {{ trans(key="weblog", lang=lang) }}
+ </a>
+ (<a href="{% if lang != "en" %}/{{ lang }}{% endif %}/weblog/archive">{{ trans(key="archive", lang=lang) }}</a>)
+ <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/weblog/feed.xml"><span class="icon"><img alt="rss-icon" src="/svg/icons/rss.svg"/></span></a>
+ </li>
+ <li>
+ <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/food/">
+ {{ trans(key="recipes", lang=lang) }}
+ </a>
+ (<a href="{% if lang != "en" %}/{{ lang }}{% endif %}/food/archive">{{ trans(key="archive", lang=lang) }}</a>)
+ <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/food/feed.xml"><span class="icon"><img alt="rss-icon" src="/svg/icons/rss.svg"/></span></a>
+ </li>
+ <li>
+ <a href="/photos/">
+ {{ trans(key="photos", lang=lang) }}
+ </a>
+ </li>
+ </ul>
+ <ul class="nav-container">
+ <li>
+ <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/donate" title="{{ trans(key="leave_tip", lang=lang) }}"><span class="icon"><img alt="btc-icon" src="/svg/icons/btc.svg"/></span> {{ trans(key="leave_tip", lang=lang) }}</a>
+ </li>
+ <li>
+ <a href="https://git.yaroslavps.com/" title="Git server"><span class="icon"><img alt="git-icon" src="/svg/icons/git.svg"/></span> Git server</a>
+ </li>
+ <li>
+ <a href="https://github.com/Yaroslav-95" title="GitHub"><span class="icon"><img alt="github-icon" src="/svg/icons/github.svg"/></span> Github</a>
+ </li>
+ <li>
+ <a href="https://sr.ht/~yaroslav/" title="sourcehut"><span class="icon"><img alt="srht-icon" src="/svg/icons/srht.svg"/></span> sourcehut</a>
+ </li>
+ </ul>
+ <!-- <p> -->
+ <!-- The text content in this site is -->
+ <!-- <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>, -->
+ <!-- the photos are under -->
+ <!-- <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">CC BY-NC-SA 4.0</a>. -->
+ <!-- </p> -->
<p>
© 2018—2022 Yaroslav de la Peña Smirnov.
</p>
+ <!-- <br> -->
+ <!-- <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png"></a> -->
+ <!-- <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png"></a> -->
</div>
</div>
</body>
diff --git a/templates/food_archive.html b/templates/food_archive.html
index e8dab8e..5f9b227 100644
--- a/templates/food_archive.html
+++ b/templates/food_archive.html
@@ -18,6 +18,31 @@ Recipe archive - Yaroslav's recipe book
Yaroslav's recipe archive
{% endif %}
</h1>
+<ul class="nav-container">
+ <li>
+ <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/">
+ {{ trans(key="back_home", lang=lang) }}
+ </a>
+ </li>
+ <li>
+ <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/food/">{{ trans(key="latest_posts", lang=lang) }}</a>
+ </li>
+ {% if lang != "en" %}
+ <li>
+ <a href="/food/archive/">🇺🇸 English</a>
+ </li>
+ {% endif %}
+ {% if lang != "ru" %}
+ <li>
+ <a href="/ru/food/archive/">🇷🇺 Русский</a>
+ </li>
+ {% endif %}
+ {% if lang != "es" %}
+ <li>
+ <a href="/es/food/archive/">🇲🇽 Español</a>
+ </li>
+ {% endif %}
+</ul>
{% endblock %}
{% block content %}
{% if lang != "en" %}
diff --git a/templates/index.html b/templates/index.html
index 21578af..c2a0aab 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,5 +1,26 @@
{% extends "base.html" %}
-{% block page %}
+{% block header %}
+<h1 class="landing-header">{{ trans(key="full_name", lang=lang) }}</h1>
+{% endblock %}
+{% block content %}
+<ul class="nav-container">
+ {% if lang != "en" %}
+ <li>
+ <a href="/">🇺🇸 English</a>
+ </li>
+ {% endif %}
+ {% if lang != "ru" %}
+ <li>
+ <a href="/ru/">🇷🇺 Русский</a>
+ </li>
+ {% endif %}
+ {% if lang != "es" %}
+ <li>
+ <a href="/es/">🇲🇽 Español</a>
+ </li>
+ {% endif %}
+</ul>
+<div class="landing-container full">
{% if lang != "en" %}
{% set weblog_path = "weblog/_index." ~ lang ~ ".md" %}
{% set recipes_path = "food/_index." ~ lang ~ ".md" %}
@@ -9,214 +30,202 @@
{% endif %}
{% set weblog = get_section(path=weblog_path) %}
{% set recipes = get_section(path=recipes_path) %}
- <div class="landing-page-container">
- <h1>{{ trans(key="full_name", lang=lang) }}</h1>
- <div class="nav-container">
- {% if lang != "en" %}
- <a href="/">🇺🇸 English</a>
- {% endif %}
- {% if lang != "ru" %}
- <a href="/ru/">🇷🇺 Русский</a>
- {% endif %}
- {% if lang != "es" %}
- <a href="/es/">🇲🇽 Español</a>
- {% endif %}
- </div>
- {% if lang == "ru" %}
- <p>
- Добро пожаловать в мой уголок интернета. Меня зовут Ярослав. Я занимаюсь
- программировнием в качестве своей работы и увлечения. В данный момент я
- работаю разработчиком ПО для технологии LTE и 5G NR.
- </p>
- <p>
- Иногда я также выкладываю то, что мне кажется интересным или полезным в
- этом сайте, хоть и не так часто как хотелось. Иногда пишу на русском, но
- по большей части пишу на английском. Вот что можно найти на моём сайте:
- </p>
- {% elif lang == "es" %}
- <p>
- Bienvenido a mi pequeño rincón de internet. Yo soy Yaroslav. Programo
- para ganarme la vida y por diversión. Actualmente trabajo escribiendo
- software para tecnologías LTE y 5G NR.
- </p>
- <p>
- A veces también publico cosas que me parecen interesantes o de valor a
- este sitio, aunque no tan seguido como me gustaría. Siéntete libre de
- echar una mirada. A veces escribo en español, pero la mayor parte del
- contenido está en inglés. Esto es lo que puedes encontrar en mi sitio:
- </p>
- {% else %}
- <p>
- Welcome to my little corner of the internet. I'm Yaroslav. I write
- software for a living, and also for fun. Currently working on software
- for LTE and 5G NR technologies.
- </p>
- <p>
- I also sometimes post things that I think are interesting or of value to
- this site, although maybe not as often as I'd like. Feel free to take a
- look around. This is what you can find on my website:
- </p>
- {% endif %}
+ {% if lang == "ru" %}
+ <p>
+ Добро пожаловать в мой уголок интернета. Меня зовут Ярослав. Я занимаюсь
+ программировнием в качестве своей работы и увлечения. В данный момент я
+ работаю разработчиком ПО для технологии LTE и 5G NR.
+ </p>
+ <p>
+ Иногда я также выкладываю то, что мне кажется интересным или полезным в
+ этом сайте, хоть и не так часто как хотелось. Иногда пишу на русском, но
+ по большей части пишу на английском. Вот что можно найти на моём сайте:
+ </p>
+ {% elif lang == "es" %}
+ <p>
+ Bienvenido a mi pequeño rincón de internet. Yo soy Yaroslav. Programo
+ para ganarme la vida y por diversión. Actualmente trabajo escribiendo
+ software para tecnologías LTE y 5G NR.
+ </p>
+ <p>
+ A veces también publico cosas que me parecen interesantes o de valor a
+ este sitio, aunque no tan seguido como me gustaría. Siéntete libre de
+ echar una mirada. A veces escribo en español, pero la mayor parte del
+ contenido está en inglés. Esto es lo que puedes encontrar en mi sitio:
+ </p>
+ {% else %}
+ <p>
+ Welcome to my little corner of the internet. I'm Yaroslav. I write
+ software for a living, and also for fun. Currently working on software
+ for LTE and 5G NR technologies.
+ </p>
+ <p>
+ I also sometimes post things that I think are interesting or of value to
+ this site, although maybe not as often as I'd like. Feel free to take a
+ look around. This is what you can find on my website:
+ </p>
+ {% endif %}
- <h2>
- <a href="{{ weblog.permalink }}">
- {{ trans(key="weblog", lang=lang) }}
- </a>
- </h2>
- {% set latest_weblog = weblog.pages[0] %}
- <p>
- {% if lang == "en" %}
- My musings on different matters and some things that I would like to
- remember.
- {% elif lang == "es" %}
- Mis reflexiones acerca de diferentes temas y ciertas cosas que quisiera
- recordar.
- {% elif lang == "ru" %}
- Мои мысли о разных предметах и то, что мне бы хотелось запомнить.
- {% endif %}
- </p>
- <div class="post-container partial">
- <h3>
- <a href="{{ latest_weblog.permalink }}">{{ latest_weblog.title }}</a>
- {% if latest_weblog.date %}
- <span class="publish-date">{{ latest_weblog.date | date }}</span>
- {% endif %}
- </h3>
- {% if latest_weblog.summary %}
- {{ latest_weblog.summary | safe }}
+ <h2>
+ <a href="{{ weblog.permalink }}">
+ {{ trans(key="weblog", lang=lang) }}
+ </a>
+ </h2>
+ {% set latest_weblog = weblog.pages[0] %}
+ <p>
+ {% if lang == "en" %}
+ My musings on different matters and some things that I would like to
+ remember.
+ {% elif lang == "es" %}
+ Mis reflexiones acerca de diferentes temas y ciertas cosas que quisiera
+ recordar.
+ {% elif lang == "ru" %}
+ Мои мысли о разных предметах и то, что мне бы хотелось запомнить.
+ {% endif %}
+ </p>
+ <div class="post-container partial">
+ <h3>
+ <a href="{{ latest_weblog.permalink }}">{{ latest_weblog.title }}</a>
+ {% if latest_weblog.date %}
+ <span class="publish-date">{{ latest_weblog.date | date }}</span>
{% endif %}
- </div>
- <div class="nav-container">
+ </h3>
+ {% if latest_weblog.summary %}
+ {{ latest_weblog.summary | safe }}
+ {% endif %}
+ </div>
+ <ul class="nav-container">
+ <li>
<a class="see-more" href="{{ weblog.permalink }}">{{ trans(key="see_more", lang=lang) }}</a>
+ </li>
+ <li>
<a href="{{ weblog.permalink }}archive">{{ trans(key="archive", lang=lang) }}</a>
+ </li>
+ <li>
<a href="{{ weblog.permalink }}feed.xml"><span class="icon"><img alt="rss-icon" src="/svg/icons/rss.svg"/></span> RSS</a>
- </div>
+ </li>
+ </ul>
- <h2>
- <a href="{{ recipes.permalink }}">
- {{ trans(key="recipes", lang=lang) }}
- </a>
- </h2>
- {% set latest_recipe = recipes.pages[0] %}
- <p>
- {% if lang == "en" %}
- A collection of my favorite recipes that I often cook.
- {% elif lang == "es" %}
- Una colección de mis recetas favoritas que cocino con frecuencia.
- {% elif lang == "ru" %}
- Набор моих любимых рецептов, которые часто готовлю.
- {% endif %}
- </p>
- <div class="post-container partial">
- <h3>
- <a href="{{ latest_recipe.permalink }}">{{ latest_recipe.title }}</a>
- {% if latest_recipe.date %}
- <span class="publish-date">{{ latest_recipe.date | date }}</span>
- {% endif %}
- </h3>
- {% if latest_recipe.summary %}
- {{ latest_recipe.summary | safe }}
+ <h2>
+ <a href="{{ recipes.permalink }}">
+ {{ trans(key="recipes", lang=lang) }}
+ </a>
+ </h2>
+ {% set latest_recipe = recipes.pages[0] %}
+ <p>
+ {% if lang == "en" %}
+ A collection of my favorite recipes that I often cook.
+ {% elif lang == "es" %}
+ Una colección de mis recetas favoritas que cocino con frecuencia.
+ {% elif lang == "ru" %}
+ Набор моих любимых рецептов, которые часто готовлю.
+ {% endif %}
+ </p>
+ <div class="post-container partial">
+ <h3>
+ <a href="{{ latest_recipe.permalink }}">{{ latest_recipe.title }}</a>
+ {% if latest_recipe.date %}
+ <span class="publish-date">{{ latest_recipe.date | date }}</span>
{% endif %}
- </div>
- <div class="nav-container">
+ </h3>
+ {% if latest_recipe.summary %}
+ {{ latest_recipe.summary | safe }}
+ {% endif %}
+ </div>
+ <ul class="nav-container">
+ <li>
<a class="see-more" href="{{ recipes.permalink }}">{{ trans(key="see_more", lang=lang) }}</a>
+ </li>
+ <li>
<a href="{{ recipes.permalink }}archive">{{ trans(key="archive", lang=lang) }}</a>
+ </li>
+ <li>
<a href="{{ recipes.permalink }}feed.xml"><span class="icon"><img alt="rss-icon" src="/svg/icons/rss.svg"/></span> RSS</a>
- </div>
+ </li>
+ </ul>
- <h2>
- <a href="/photos">
- {{ trans(key="photos", lang=lang) }}
- </a>
- </h2>
- <p>
- {% if lang == "en" %}
- A gallery with some photographs I've taken on my free time.
- {% elif lang == "es" %}
- Una galería de fotografías que he tomado en mi tiempo libre.
- {% elif lang == "ru" %}
- Галерея с фотографиями сняты в моё свободное время.
- {% endif %}
- </p>
- <div class="album-container">
- <a href="https://www.yaroslavps.com/photos/st-petersburg-summer-2019/_DSC3948">
- <img alt="" class="thumbnail" src="https://www.yaroslavps.com/photos/st-petersburg-summer-2019/_DSC3948/_DSC3948_thumb.jpg">
- </a>
- <a href="https://www.yaroslavps.com/photos/valaam-2022/DSC_5183">
- <img alt="" class="thumbnail" src="https://www.yaroslavps.com/photos/valaam-2022/DSC_5183/DSC_5183_thumb.jpg">
- </a>
- <a href="https://www.yaroslavps.com/photos/valaam-2022/DSC_4426">
- <img alt="" class="thumbnail" src="https://www.yaroslavps.com/photos/valaam-2022/DSC_4426/DSC_4426_thumb.jpg">
- </a>
- <a href="https://www.yaroslavps.com/photos/ladoga-winter-2022/DSC_3437">
- <img alt="" class="thumbnail" src="https://www.yaroslavps.com/photos/ladoga-winter-2022/DSC_3437/DSC_3437_thumb.jpg">
- </a>
- </div>
- <div class="nav-container">
+ <h2>
+ <a href="/photos">
+ {{ trans(key="photos", lang=lang) }}
+ </a>
+ </h2>
+ <p>
+ {% if lang == "en" %}
+ A gallery with some photographs I've taken on my free time.
+ {% elif lang == "es" %}
+ Una galería de fotografías que he tomado en mi tiempo libre.
+ {% elif lang == "ru" %}
+ Галерея с фотографиями сняты в моё свободное время.
+ {% endif %}
+ </p>
+ <div class="album-container">
+ <a href="https://www.yaroslavps.com/photos/st-petersburg-summer-2019/_DSC3948">
+ <img alt="" class="thumbnail" src="https://www.yaroslavps.com/photos/st-petersburg-summer-2019/_DSC3948/_DSC3948_thumb.jpg">
+ </a>
+ <a href="https://www.yaroslavps.com/photos/priozersk-2020/_DSC5814/">
+ <img alt="" class="thumbnail" src="https://www.yaroslavps.com/photos/priozersk-2020/_DSC5814/_DSC5814_thumb.jpg">
+ </a>
+ <a href="https://www.yaroslavps.com/photos/valaam-2022/DSC_4426">
+ <img alt="" class="thumbnail" src="https://www.yaroslavps.com/photos/valaam-2022/DSC_4426/DSC_4426_thumb.jpg">
+ </a>
+ <a href="https://www.yaroslavps.com/photos/priozersk-2020/_DSC5711/">
+ <img alt="" class="thumbnail" src="https://www.yaroslavps.com/photos/priozersk-2020/_DSC5711/_DSC5711_thumb.jpg">
+ </a>
+ </div>
+ <ul class="nav-container">
+ <li>
<a class="see-more" href="/photos">{{ trans(key="see_more", lang=lang) }}</a>
- </div>
+ </li>
+ </ul>
- <h2 id="contact">
- {% if lang == "ru" %}
- Связаться
- {% elif lang == "es" %}
- Contacto
- {% else %}
- Contact
- {% endif %}
- </h2>
- <p>
- {% if lang == "ru" %}
- Связаться со мной можно по электронной почты:
- {% elif lang == "es" %}
- Si quieres contactarme, puedes enviarme un correo electrónico a la
- siguiente dirección:
- {% else %}
- If you want to contact me, you can do so by email at:
- {% endif %}
- <a href="mailto:yps@yaroslavps.com">yps@yaroslavps.com</a>
- </p>
- <p>
- {% if lang == "ru" %}
- Если вы пользуетесь такими сервисами как gmail, mail.ru или другими
- крупными провайдерами из этого разряда, то мой ответ может попасть в
- спам. Если вы хотите быть полностью уверенными что вы получите мой
- ответ, добавьте мой адрес в белый список.
- {% elif lang == "es" %}
- Una pequeña nota para aquellos que usan servicios como gmail,
- outlook u otros proveedores similares. Mi respuesta de email puede
- llegar a su bandeja de espam. Si quieres estar completamente seguro
- de recibir mi respuesta, agrega mi dirección a tu lista blanca.
- {% else %}
- A little note for those using services like gmail, outlook, or any
- other big provider like that. My email response might end up in your
- spam folder, so you might want to check that. If you want to make
- 100% sure to receive my reponse, the best option is to add my
- address to your whitelist.
- {% endif %}
- </p>
- <p>
- {% if lang == "ru" %}
- PGP-ключ:
- {% elif lang == "es" %}
- Llave de PGP:
- {% else %}
- PGP key:
- {% endif %}
- <a href="https://www.yaroslavps.com/files/yaroslavpub.gpg">BD900E5D624046DC</a>
- </p>
- <h2>{{ trans(key="other_links", lang=lang) }}</h2>
- <div class="nav-container">
- {% if lang == "en" %}
- <a href="/donate" title="Leave a tip"><span class="icon"><img alt="btc-icon" src="/svg/icons/btc.svg"/></span> Leave a tip</a>
- {% elif lang == "es" %}
- <a href="/es/donate" title="Dejar propina"><span class="icon"><img alt="btc-icon" src="/svg/icons/btc.svg"/></span> Dejar propinar</a>
- {% elif lang == "ru" %}
- <a href="/ru/donate" title="Оставить чайвые"><span class="icon"><img alt="btc-icon" src="/svg/icons/btc.svg"/></span> Оставить чайвые</a>
- {% endif %}
- <a href="https://git.yaroslavps.com/" title="Git server"><span class="icon"><img alt="git-icon" src="/svg/icons/git.svg"/></span> Git server</a>
- <a href="https://github.com/Yaroslav-95" title="GitHub"><span class="icon"><img alt="github-icon" src="/svg/icons/github.svg"/></span> Github</a>
- <a href="https://sr.ht/~yaroslav/" title="sourcehut"><span class="icon"><img alt="srht-icon" src="/svg/icons/srht.svg"/></span> sourcehut</a>
- </div>
- </div>
+ <h2 id="contact">
+ {% if lang == "ru" %}
+ Связаться
+ {% elif lang == "es" %}
+ Contacto
+ {% else %}
+ Contact
+ {% endif %}
+ </h2>
+ <p>
+ {% if lang == "ru" %}
+ Связаться со мной можно по электронной почты:
+ {% elif lang == "es" %}
+ Si quieres contactarme, puedes enviarme un correo electrónico a la
+ siguiente dirección:
+ {% else %}
+ If you want to contact me, you can do so by email at:
+ {% endif %}
+ <a href="mailto:yps@yaroslavps.com">yps@yaroslavps.com</a>
+ </p>
+ <p>
+ {% if lang == "ru" %}
+ Если вы пользуетесь такими сервисами как gmail, mail.ru или другими
+ крупными провайдерами из этого разряда, то мой ответ может попасть в
+ спам. Если вы хотите быть полностью уверенными что вы получите мой
+ ответ, добавьте мой адрес в белый список.
+ {% elif lang == "es" %}
+ Una pequeña nota para aquellos que usan servicios como gmail,
+ outlook u otros proveedores similares. Mi respuesta de email puede
+ llegar a su bandeja de espam. Si quieres estar completamente seguro
+ de recibir mi respuesta, agrega mi dirección a tu lista blanca.
+ {% else %}
+ A little note for those using services like gmail, outlook, or any
+ other big provider like that. My email response might end up in your
+ spam folder, so you might want to check that. If you want to make
+ 100% sure to receive my reponse, the best option is to add my
+ address to your whitelist.
+ {% endif %}
+ </p>
+ <p>
+ {% if lang == "ru" %}
+ PGP-ключ:
+ {% elif lang == "es" %}
+ Llave de PGP:
+ {% else %}
+ PGP key:
+ {% endif %}
+ <a href="https://www.yaroslavps.com/files/yaroslavpub.gpg">BD900E5D624046DC</a>
+ </p>
+</div>
{% endblock %}
diff --git a/templates/page.html b/templates/page.html
index 4c9a18c..ce07c6d 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -31,27 +31,22 @@
<p class="publish-date">
{% if page.date %}
{{ trans(key="published", lang=lang) }}
- {{ page.date | date(format="%Y-%m-%d %H:%M UTC") }}
+ {{ page.date | date(format="%Y-%m-%d") }}
{{ trans(key="published_on", lang=lang) }}
{% else %}
{{ trans(key="not_published", lang=lang) }}
{% endif %}
- {% if page.permalink is containing("weblog") %}
- <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/weblog">
- {{ trans(key="weblog_title", lang=lang) }}
- </a>
- {% elif page.permalink is containing("food") %}
- <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/food">
- {{ trans(key="recipes_title", lang=lang) }}
- </a></p>
- {% endif %}
+ {%- if page.permalink is containing("weblog") -%}
+ <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/weblog">{{ trans(key="weblog_title", lang=lang) }}</a>
+ {%- elif page.permalink is containing("food") -%}
+ <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/food">{{ trans(key="recipes_title", lang=lang) }}</a>
+ {%- endif -%}
+ {%- if page.updated -%}
+ .
+ {{ trans(key="edited", lang=lang) }}
+ {{ page.updated | date(format="%Y-%m-%d") }}
+ {% endif -%}
</p>
-{% if page.updated %}
-<p class="publish-date">
- {{ trans(key="edited", lang=lang) }}
- {{ page.updated | date(format="%Y-%m-%d %H:%M UTC") }}
-</p>
-{% endif %}
{% if page.translations | length > 1 %}
<p class="publish-date">
{{ trans(key="also_read", lang=lang) }}
@@ -70,7 +65,7 @@
{% endif %}
{% endblock %}
{% block content %}
- <div class="post-container full">
- {{ page.content | safe }}
- </div>
+<div class="post-container full">
+{{ page.content | safe }}
+</div>
{% endblock %}
diff --git a/templates/weblog.html b/templates/weblog.html
index c7abcc2..2afe42c 100644
--- a/templates/weblog.html
+++ b/templates/weblog.html
@@ -23,27 +23,74 @@
{% block header %}
{% if section.permalink is containing("weblog") %}
<h1>
- {% if lang == "ru" %}
+ {%- if lang == "ru" -%}
Веб-журнал Ярослава
- {% elif lang == "es" %}
+ {%- elif lang == "es" -%}
Weblog de Yaroslav
- {% else %}
+ {%- else -%}
Yaroslav's weblog
- {% endif %}
+ {%- endif -%}
</h1>
{% elif section.permalink is containing("food") %}
<h1>
- {% if lang == "ru" %}
+ {%- if lang == "ru" -%}
Книга рецептов Ярослава
- {% elif lang == "es" %}
+ {%- elif lang == "es" -%}
Recetario de Yaroslav
- {% else %}
+ {%- else -%}
Yaroslav's recipe book
- {% endif %}
+ {%- endif -%}
</h1>
{% else %}
<h1>Yaroslav's website</h1>
{% endif %}
+ <ul class="nav-container">
+ <li>
+ <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/">
+ {{ trans(key="back_home", lang=lang) }}
+ </a>
+ </li>
+ {% if section.permalink is containing("weblog") %}
+ <li>
+ <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/weblog/archive">{{ trans(key="archive", lang=lang) }}</a>
+ </li>
+ {% if lang != "en" %}
+ <li>
+ <a href="/weblog/">🇺🇸 English</a>
+ </li>
+ {% endif %}
+ {% if lang != "ru" %}
+ <li>
+ <a href="/ru/weblog/">🇷🇺 Русский</a>
+ </li>
+ {% endif %}
+ {% if lang != "es" %}
+ <li>
+ <a href="/es/weblog/">🇲🇽 Español</a>
+ </li>
+ {% endif %}
+ {% elif section.permalink is containing("food") %}
+ <li>
+
+ <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/food/archive">{{ trans(key="archive", lang=lang) }}</a>
+ </li>
+ {% if lang != "en" %}
+ <li>
+ <a href="/food/">🇺🇸 English</a>
+ </li>
+ {% endif %}
+ {% if lang != "ru" %}
+ <li>
+ <a href="/food/ru/">🇷🇺 Русский</a>
+ </li>
+ {% endif %}
+ {% if lang != "es" %}
+ <li>
+ <a href="/food/es/">🇲🇽 Español</a>
+ </li>
+ {% endif %}
+ {% endif %}
+ </ul>
{% endblock %}
{% block content %}
<div class="posts-list">
diff --git a/templates/weblog_archive.html b/templates/weblog_archive.html
index 74613e4..577ad0d 100644
--- a/templates/weblog_archive.html
+++ b/templates/weblog_archive.html
@@ -18,6 +18,31 @@ Weblog archive - Yaroslav's weblog
Yaroslav's weblog archive
{% endif %}
</h1>
+<ul class="nav-container">
+ <li>
+ <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/">
+ {{ trans(key="back_home", lang=lang) }}
+ </a>
+ </li>
+ <li>
+ <a href="{% if lang != "en" %}/{{ lang }}{% endif %}/weblog/">{{ trans(key="latest_posts", lang=lang) }}</a>
+ </li>
+ {% if lang != "en" %}
+ <li>
+ <a href="/weblog/archive/">🇺🇸 English</a>
+ </li>
+ {% endif %}
+ {% if lang != "ru" %}
+ <li>
+ <a href="/ru/weblog/archive/">🇷🇺 Русский</a>
+ </li>
+ {% endif %}
+ {% if lang != "es" %}
+ <li>
+ <a href="/es/weblog/archive/">🇲🇽 Español</a>
+ </li>
+ {% endif %}
+</ul>
{% endblock %}
{% block content %}
{% if lang != "en" %}