fix: форматирование, опечатка в статье
@@ -1155,8 +1155,13 @@
|
||||
<div class="highlight-wrapper"><div class="highlight"><pre tabindex="0" class="chroma"><code class="language-text" data-lang="text"><span class="line"><span class="cl">~/projects/blog/ ← одна папка, две ветки
|
||||
</span></span><span class="line"><span class="cl"> ├── main ← production (blog.ru)
|
||||
</span></span><span class="line"><span class="cl"> └── dev ← development (dev.blog.ru)</span></span></code></pre></div></div>
|
||||
<p><strong>Принцип:</strong> Одна папка, две ветки. Переключение через <code>git checkout</code>, не через разные директории.</p>
|
||||
<hr>
|
||||
<div class="admonition relative overflow-hidden rounded-lg border-l-4 my-3 px-4 py-3 shadow-sm" data-type="important">
|
||||
<div class="flex items-center gap-2 font-semibold text-inherit">
|
||||
<div class="flex shrink-0 h-5 w-5 items-center justify-center text-lg"><span class="relative block icon"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M287.9 0C297.1 0 305.5 5.25 309.5 13.52L378.1 154.8L531.4 177.5C540.4 178.8 547.8 185.1 550.7 193.7C553.5 202.4 551.2 211.9 544.8 218.2L433.6 328.4L459.9 483.9C461.4 492.9 457.7 502.1 450.2 507.4C442.8 512.7 432.1 513.4 424.9 509.1L287.9 435.9L150.1 509.1C142.9 513.4 133.1 512.7 125.6 507.4C118.2 502.1 114.5 492.9 115.1 483.9L142.2 328.4L31.11 218.2C24.65 211.9 22.36 202.4 25.2 193.7C28.03 185.1 35.5 178.8 44.49 177.5L197.7 154.8L266.3 13.52C270.4 5.249 278.7 0 287.9 0L287.9 0zM287.9 78.95L235.4 187.2C231.9 194.3 225.1 199.3 217.3 200.5L98.98 217.9L184.9 303C190.4 308.5 192.9 316.4 191.6 324.1L171.4 443.7L276.6 387.5C283.7 383.7 292.2 383.7 299.2 387.5L404.4 443.7L384.2 324.1C382.9 316.4 385.5 308.5 391 303L476.9 217.9L358.6 200.5C350.7 199.3 343.9 194.3 340.5 187.2L287.9 78.95z"/></svg></span></div>
|
||||
<div class="grow">
|
||||
<strong>Принцип:</strong> Одна папка, две ветки. Переключение через <code>git checkout</code>, не через разные директории.
|
||||
</div>
|
||||
</div></div><hr>
|
||||
|
||||
<h2 class="relative group">Золотые правила
|
||||
<div id="золотые-правила" class="anchor"></div>
|
||||
@@ -1618,8 +1623,13 @@
|
||||
</span></span><span class="line"><span class="cl">git merge dev --no-edit
|
||||
</span></span><span class="line"><span class="cl">git push origin main</span></span></code></pre></div></div>
|
||||
<hr>
|
||||
<p><strong>Помни:</strong> Dev для экспериментов, main для проверенного контента. Всегда тестируй перед публикацией.</p>
|
||||
|
||||
<div class="admonition relative overflow-hidden rounded-lg border-l-4 my-3 px-4 py-3 shadow-sm" data-type="important">
|
||||
<div class="flex items-center gap-2 font-semibold text-inherit">
|
||||
<div class="flex shrink-0 h-5 w-5 items-center justify-center text-lg"><span class="relative block icon"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M287.9 0C297.1 0 305.5 5.25 309.5 13.52L378.1 154.8L531.4 177.5C540.4 178.8 547.8 185.1 550.7 193.7C553.5 202.4 551.2 211.9 544.8 218.2L433.6 328.4L459.9 483.9C461.4 492.9 457.7 502.1 450.2 507.4C442.8 512.7 432.1 513.4 424.9 509.1L287.9 435.9L150.1 509.1C142.9 513.4 133.1 512.7 125.6 507.4C118.2 502.1 114.5 492.9 115.1 483.9L142.2 328.4L31.11 218.2C24.65 211.9 22.36 202.4 25.2 193.7C28.03 185.1 35.5 178.8 44.49 177.5L197.7 154.8L266.3 13.52C270.4 5.249 278.7 0 287.9 0L287.9 0zM287.9 78.95L235.4 187.2C231.9 194.3 225.1 199.3 217.3 200.5L98.98 217.9L184.9 303C190.4 308.5 192.9 316.4 191.6 324.1L171.4 443.7L276.6 387.5C283.7 383.7 292.2 383.7 299.2 387.5L404.4 443.7L384.2 324.1C382.9 316.4 385.5 308.5 391 303L476.9 217.9L358.6 200.5C350.7 199.3 343.9 194.3 340.5 187.2L287.9 78.95z"/></svg></span></div>
|
||||
<div class="grow">
|
||||
<strong>Важно:</strong> <code>Dev</code> для экспериментов, <code>main</code> для проверенного контента. Всегда тестируй перед публикацией.
|
||||
</div>
|
||||
</div></div>
|
||||
|
||||
|
||||
|
||||
@@ -3282,6 +3292,34 @@
|
||||
<footer class="pt-8 max-w-prose print:hidden">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="pt-8">
|
||||
<hr class="border-dotted border-neutral-300 dark:border-neutral-600">
|
||||
<div class="flex justify-between pt-3">
|
||||
<span class="flex flex-col">
|
||||
|
||||
</span>
|
||||
<span class="flex flex-col items-end">
|
||||
|
||||
<a
|
||||
class="flex text-right text-neutral-700 hover:text-primary-600 dark:text-neutral dark:hover:text-primary-400"
|
||||
href="/cheatsheets/shortcodes/">
|
||||
<span class="leading-6">
|
||||
Shortcodes <span class="inline-block rtl:rotate-180">→</span>
|
||||
</span>
|
||||
</a>
|
||||
|
||||
<span class="me-6 mt-1 text-xs text-neutral-500 dark:text-neutral-400">
|
||||
<time datetime="0001-01-01T00:00:00+00:00">1 января 0001</time>
|
||||
</span>
|
||||
|
||||
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1020,6 +1020,285 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<article class="article-link--simple flex flex-col md:flex-row relative">
|
||||
|
||||
<div class="flex-none relative overflow-hidden thumbnail-shadow md:mr-7 thumbnail">
|
||||
<img
|
||||
src="/img/background_hu_7658a5e11b3ad5f2.png"
|
||||
role="presentation"
|
||||
loading="lazy"
|
||||
decoding="async"
|
||||
class="not-prose absolute inset-0 w-full h-full object-cover">
|
||||
</div>
|
||||
|
||||
<div class=" mt-3 md:mt-0">
|
||||
<header class="items-center text-start text-xl font-semibold">
|
||||
<a
|
||||
|
||||
href="/cheatsheets/shortcodes/"
|
||||
|
||||
class="not-prose before:absolute before:inset-0 decoration-primary-500 dark:text-neutral text-xl font-bold text-neutral-800 hover:underline hover:underline-offset-2">
|
||||
<h2>
|
||||
Shortcodes
|
||||
|
||||
</h2>
|
||||
</a>
|
||||
|
||||
<div class="ms-2"><span class="flex cursor-pointer">
|
||||
<span
|
||||
class="rounded-md border border-primary-400 px-1 py-[1px] text-xs font-normal text-primary-700 dark:border-primary-600 dark:text-primary-400">
|
||||
Черновик
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
|
||||
</header>
|
||||
<div class="text-sm text-neutral-500 dark:text-neutral-400">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="flex flex-row flex-wrap items-center">
|
||||
|
||||
|
||||
<time datetime="0001-01-01T00:00:00+00:00">1 января 0001</time><span class="px-2 text-primary-500">·</span><span title="Время чтения">17 минут</span><span class="px-2 text-primary-500">·</span><span>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<span
|
||||
id="views_cheatsheets/blowfish-shortcodes/index.md"
|
||||
class="animate-pulse inline-block text-transparent max-h-3 rounded-full -mt-[2px] align-middle bg-neutral-300 dark:bg-neutral-400"
|
||||
title="views"
|
||||
>loading</span
|
||||
>
|
||||
<span class="inline-block align-text-bottom"><span class="relative block icon"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
|
||||
<path fill="currentColor" d="M288 32c-80.8 0-145.5 36.8-192.6 80.6C48.6 156 17.3 208 2.5 243.7c-3.3 7.9-3.3 16.7 0 24.6C17.3 304 48.6 356 95.4 399.4C142.5 443.2 207.2 480 288 480s145.5-36.8 192.6-80.6c46.8-43.5 78.1-95.4 93-131.1c3.3-7.9 3.3-16.7 0-24.6c-14.9-35.7-46.2-87.7-93-131.1C433.5 68.8 368.8 32 288 32zM432 256c0 79.5-64.5 144-144 144s-144-64.5-144-144s64.5-144 144-144s144 64.5 144 144zM288 192c0 35.3-28.7 64-64 64c-11.5 0-22.3-3-31.6-8.4c-.2 2.8-.4 5.5-.4 8.4c0 53 43 96 96 96s96-43 96-96s-43-96-96-96c-2.8 0-5.6 .1-8.4 .4c5.3 9.3 8.4 20.1 8.4 31.6z"/></svg></span></span>
|
||||
</span>
|
||||
<span class="px-2 text-primary-500">·</span><span>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<span
|
||||
id="likes_cheatsheets/blowfish-shortcodes/index.md"
|
||||
class="animate-pulse inline-block text-transparent max-h-3 rounded-full -mt-[2px] align-middle bg-neutral-300 dark:bg-neutral-400"
|
||||
title="likes"
|
||||
>loading</span
|
||||
>
|
||||
<span class="inline-block align-text-bottom"><span class="relative block icon"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
|
||||
<path fill="currentColor" d="M47.6 300.4L228.3 469.1c7.5 7 17.4 10.9 27.7 10.9s20.2-3.9 27.7-10.9L464.4 300.4c30.4-28.3 47.6-68 47.6-109.5v-5.8c0-69.9-50.5-129.5-119.4-141C347 36.5 300.6 51.4 268 84L256 96 244 84c-32.6-32.6-79-47.5-124.6-39.9C50.5 55.6 0 115.2 0 185.1v5.8c0 41.5 17.2 81.2 47.6 109.5z"/></svg></span></span>
|
||||
</span>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="flex flex-row flex-wrap items-center">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<a class="relative mt-[0.5rem] me-2" href="/tags/shortcodes/">
|
||||
<span class="flex cursor-pointer">
|
||||
<span
|
||||
class="rounded-md border border-primary-400 px-1 py-[1px] text-xs font-normal text-primary-700 dark:border-primary-600 dark:text-primary-400">
|
||||
Shortcodes
|
||||
</span>
|
||||
</span>
|
||||
|
||||
</a>
|
||||
|
||||
<a class="relative mt-[0.5rem] me-2" href="/tags/mermaid/">
|
||||
<span class="flex cursor-pointer">
|
||||
<span
|
||||
class="rounded-md border border-primary-400 px-1 py-[1px] text-xs font-normal text-primary-700 dark:border-primary-600 dark:text-primary-400">
|
||||
Mermaid
|
||||
</span>
|
||||
</span>
|
||||
|
||||
</a>
|
||||
|
||||
<a class="relative mt-[0.5rem] me-2" href="/tags/icon/">
|
||||
<span class="flex cursor-pointer">
|
||||
<span
|
||||
class="rounded-md border border-primary-400 px-1 py-[1px] text-xs font-normal text-primary-700 dark:border-primary-600 dark:text-primary-400">
|
||||
Icon
|
||||
</span>
|
||||
</span>
|
||||
|
||||
</a>
|
||||
|
||||
<a class="relative mt-[0.5rem] me-2" href="/tags/lead/">
|
||||
<span class="flex cursor-pointer">
|
||||
<span
|
||||
class="rounded-md border border-primary-400 px-1 py-[1px] text-xs font-normal text-primary-700 dark:border-primary-600 dark:text-primary-400">
|
||||
Lead
|
||||
</span>
|
||||
</span>
|
||||
|
||||
</a>
|
||||
|
||||
<a class="relative mt-[0.5rem] me-2" href="/tags/docs/">
|
||||
<span class="flex cursor-pointer">
|
||||
<span
|
||||
class="rounded-md border border-primary-400 px-1 py-[1px] text-xs font-normal text-primary-700 dark:border-primary-600 dark:text-primary-400">
|
||||
Docs
|
||||
</span>
|
||||
</span>
|
||||
|
||||
</a>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="px-6 pt-4 pb-2"></div>
|
||||
</article>
|
||||
|
||||
|
||||
|
||||
|
||||
</section>
|
||||
|
||||
|
||||
@@ -11,6 +11,16 @@
|
||||
<copyright>© 2026 Олег Казанин</copyright>
|
||||
<lastBuildDate>Mon, 23 Feb 2026 00:00:00 +0000</lastBuildDate><atom:link href="http://192.168.11.190:1313/cheatsheets/index.xml" rel="self" type="application/rss+xml" />
|
||||
|
||||
<item>
|
||||
<title>Shortcodes</title>
|
||||
<link>http://192.168.11.190:1313/cheatsheets/shortcodes/</link>
|
||||
<pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
|
||||
<author>oakazanin@ya.ru (Олег Казанин)</author>
|
||||
<guid>http://192.168.11.190:1313/cheatsheets/shortcodes/</guid>
|
||||
<description></description>
|
||||
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<title>Git Workflow для Hugo блога</title>
|
||||
<link>http://192.168.11.190:1313/cheatsheets/git-workflow/</link>
|
||||
|
||||
|
After Width: | Height: | Size: 46 KiB |
|
After Width: | Height: | Size: 127 KiB |
|
After Width: | Height: | Size: 59 KiB |
|
After Width: | Height: | Size: 48 KiB |
|
After Width: | Height: | Size: 109 KiB |
|
After Width: | Height: | Size: 55 KiB |
|
After Width: | Height: | Size: 71 KiB |
|
After Width: | Height: | Size: 125 KiB |
|
After Width: | Height: | Size: 66 KiB |
|
After Width: | Height: | Size: 88 KiB |
|
After Width: | Height: | Size: 76 KiB |
|
After Width: | Height: | Size: 167 KiB |
|
After Width: | Height: | Size: 56 KiB |