Skip to content

Commit

Permalink
Merge pull request #6110 from werf/docs-1.1-fix-routes-1
Browse files Browse the repository at this point in the history
docs(1.1): fix routes
  • Loading branch information
ilya-lesikov authored May 13, 2024
2 parents 8359483 + 939dcb7 commit 2760289
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ docs/\.jekyll-cache/
/tests/integration/three-way-merge/**/main
/bin
/tests-coverage
/build/
/dist/
4 changes: 2 additions & 2 deletions docs/_includes/nav-breadcrumbs.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

{%- if breadcrumb %}
<li class="breadcrumbs__item">
<a href="{{ breadcrumb.url | relative_url }}">{{ breadcrumb.title }}</a>
<a href="{{ site.canonical_url_prefix }}{{ breadcrumb.url | relative_url }}">{{ breadcrumb.title }}</a>
</li>
{%- endif %}
{%- endfor %}
Expand All @@ -31,4 +31,4 @@
</a>
<!--#include virtual="/includes/channel-menu.html" -->
</div>
</div>
</div>
16 changes: 8 additions & 8 deletions docs/_includes/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
{%- if folderitem.external_url %}
<li class="sidebar__submenu-item"><a href="{{ folderitem.external_url }}" target="_blank">{{folderitem.title}}</a></li>
{%- elsif page.url == folderitem.url %}
<li class="sidebar__submenu-item active"><a href="{{ folderitem.url | relative_url }}">{{folderitem.title}}</a></li>
<li class="sidebar__submenu-item active"><a href="{{ site.canonical_url_prefix }}{{ folderitem.url | relative_url }}">{{folderitem.title}}</a></li>
{%- else %}
{%- if page.name == '404.md' %}
<li class="sidebar__submenu-item"><a href="{{ site.canonical_url_prefix }}{{ folderitem.url | relative_url }}">{{folderitem.title}}</a></li>
{% else %}
<li class="sidebar__submenu-item"><a href="{{ folderitem.url | relative_url }}">{{folderitem.title}}</a></li>
<li class="sidebar__submenu-item"><a href="{{ site.canonical_url_prefix }}{{ folderitem.url | relative_url }}">{{folderitem.title}}</a></li>
{%- endif %}
{%- endif %}
{%- endfor %}
Expand All @@ -33,12 +33,12 @@
{%- if subfolderitem.external_url %}
<li class="sidebar__submenu-item"><a href="{{ subfolderitem.external_url }}" target="_blank">{{subfolderitem.title}}</a></li>
{%- elsif page.url == subfolderitem.url %}
<li class="sidebar__submenu-item active"><a href="{{ subfolderitem.url | relative_url }}">{{subfolderitem.title}}</a></li>
<li class="sidebar__submenu-item active"><a href="{{ site.canonical_url_prefix }}{{ subfolderitem.url | relative_url }}">{{subfolderitem.title}}</a></li>
{%- else %}
{%- if page.name == '404.md' %}
<li class="sidebar__submenu-item"><a href="{{ site.canonical_url_prefix }}{{ subfolderitem.url | relative_url }}">{{subfolderitem.title}}</a></li>
{% else %}
<li class="sidebar__submenu-item"><a href="{{ subfolderitem.url | relative_url }}">{{subfolderitem.title}}</a></li>
<li class="sidebar__submenu-item"><a href="{{ site.canonical_url_prefix }}{{ subfolderitem.url | relative_url }}">{{subfolderitem.title}}</a></li>
{%- endif %}
{%- endif %}
{%- endfor %}
Expand All @@ -47,12 +47,12 @@
{%- elsif subfolders.external_url %}
<li class="sidebar__submenu-item"><a href="{{ subfolders.external_url }}" target="_blank">{{subfolders.title}}</a></li>
{%- elsif page.url == subfolders.url %}
<li class="sidebar__submenu-item active"><a href="{{ subfolders.url | relative_url }}">{{subfolders.title}}</a></li>
<li class="sidebar__submenu-item active"><a href="{{ site.canonical_url_prefix }}{{ subfolders.url | relative_url }}">{{subfolders.title}}</a></li>
{%- else %}
{%- if page.name == '404.md' %}
<li class="sidebar__submenu-item"><a href="{{ site.canonical_url_prefix }}{{ subfolders.url | relative_url }}">{{subfolders.title}}</a></li>
{% else %}
<li class="sidebar__submenu-item"><a href="{{ subfolders.url | relative_url }}">{{subfolders.title}}</a></li>
<li class="sidebar__submenu-item"><a href="{{ site.canonical_url_prefix }}{{ subfolders.url | relative_url }}">{{subfolders.title}}</a></li>
{%- endif %}
{%- endif %}
{%- endfor %}
Expand All @@ -61,12 +61,12 @@
{%- elsif folder.external_url %}
<li class="sidebar__item"><a href="{{ folder.external_url }}" target="_blank">{{folder.title}}</a></li>
{%- elsif page.url == folder.url %}
<li class="sidebar__item active"><a href="{{ folder.url | relative_url }}">{{folder.title}}</a></li>
<li class="sidebar__item active"><a href="{{ site.canonical_url_prefix }}{{ folder.url | relative_url }}">{{folder.title}}</a></li>
{%- else %}
{%- if page.name == '404.md' %}
<li class="sidebar__item"><a href="{{ site.canonical_url_prefix }}{{ folder.url | relative_url }}">{{folder.title}}</a></li>
{% else %}
<li class="sidebar__item"><a href="{{ folder.url | relative_url }}">{{folder.title}}</a></li>
<li class="sidebar__item"><a href="{{ site.canonical_url_prefix }}{{ folder.url | relative_url }}">{{folder.title}}</a></li>
{%- endif %}
{%- endif %}
{%- endfor %}
Expand Down

0 comments on commit 2760289

Please sign in to comment.