Skip to content

Commit

Permalink
Merge branch 'kamal-2' into remove-traefik-from-the-commands
Browse files Browse the repository at this point in the history
  • Loading branch information
igor-alexandrov authored Sep 21, 2024
2 parents eb36dc1 + c574ca4 commit cba5d73
Show file tree
Hide file tree
Showing 76 changed files with 1,111 additions and 440 deletions.
23 changes: 19 additions & 4 deletions _data/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
url: /docs/configuration/
index: false
sections:
- title: "Configuration overview"
url: /docs/configuration/configuration-overview/
- title: "Overview"
url: /docs/configuration/overview/
- title: "Accessories"
url: /docs/configuration/accessories/
- title: "Aliases"
Expand Down Expand Up @@ -93,8 +93,8 @@
url: /docs/hooks/
index: false
sections:
- title: "Hooks overview"
url: /docs/hooks/hooks-overview/
- title: "Overview"
url: /docs/hooks/overview/
- title: "docker-setup"
url: /docs/hooks/docker-setup/
- title: "pre-connect"
Expand All @@ -109,3 +109,18 @@
url: /docs/hooks/pre-proxy-reboot/
- title: "post-proxy-reboot"
url: /docs/hooks/post-proxy-reboot/

- title: "Upgrade Guide"
url: /docs/upgrading/
index: false
sections:
- title: "Overview"
url: /docs/upgrading/overview/
- title: "Proxy changes"
url: /docs/upgrading/proxy-changes/
- title: "Network changes"
url: /docs/upgrading/network-changes/
- title: "Configuration changes"
url: /docs/upgrading/configuration-changes/
- title: "Secrets changes"
url: /docs/upgrading/secrets-changes/
8 changes: 4 additions & 4 deletions _data/docs_v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
url: /v1/docs/configuration/
index: false
sections:
- title: "Configuration overview"
url: /v1/docs/configuration/configuration-overview/
- title: "Overview"
url: /v1/docs/configuration/overview/
- title: "Accessories"
url: /v1/docs/configuration/accessories/
- title: "Booting"
Expand Down Expand Up @@ -91,8 +91,8 @@
url: /v1/docs/hooks/
index: false
sections:
- title: "Hooks overview"
url: /v1/docs/hooks/hooks-overview/
- title: "Overview"
url: /v1/docs/hooks/overview/
- title: "docker-setup"
url: /v1/docs/hooks/docker-setup/
- title: "pre-connect"
Expand Down
4 changes: 2 additions & 2 deletions _data/nav.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
- title: "Documentation"
url: /docs/
options:
- title: "Kamal V2 docs"
- title: "Version 2.0.0"
url: /docs/
- title: "Kamal V1 docs"
- title: "Version 1.8.3"
url: /v1/docs/

- title: "Source code"
Expand Down
2 changes: 1 addition & 1 deletion _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<p>Brought to you by the makers of:</p>
<ul>
<li><a href="https://basecamp.com" target="_blank" rel="noopener"><img src="{{ '/assets/images/logo-basecamp.svg' }}" alt="Basecamp"></a></li>
<li><span>and</span></li>
<li><a href="https://hey.com" target="_blank" rel="noopener"><img src="{{ '/assets/images/logo-hey.svg' }}" alt="HEY"></a></li>
<li><a href="https://once.com" target="_blank" rel="noopener"><img src="{{ '/assets/images/logo-once.svg' }}" alt="ONCE"></a></li>
</ul>
<p>&copy; {{ 'now' | date: '%Y' }} <a href="https://37signals.com" target="_blank" rel="noopener">37signals</a></p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions _includes/nav.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{% if page.version == 'v1' %}

{% assign search_action = '/v1/docs/search/' %}
{% assign search_placeholder = 'Search V1 docs...' %}
{% assign search_placeholder = 'Search v1 docs...' %}

{% assign data_docs = site.data.docs_v1 %}

{% else %}

{% assign search_action = '/docs/search/' %}
{% assign search_placeholder = 'Search V2 docs...' %}
{% assign search_placeholder = 'Search v2 docs...' %}

{% assign data_docs = site.data.docs %}

Expand Down
4 changes: 2 additions & 2 deletions _layouts/docs.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
{% if page.version == 'v1' %}

{% assign search_action = '/v1/docs/search/' %}
{% assign search_placeholder = 'Search V1 docs...' %}
{% assign search_placeholder = 'Search v1 docs...' %}

{% assign data_docs = site.data.docs_v1 %}

{% else %}

{% assign search_action = '/docs/search/' %}
{% assign search_placeholder = 'Search V2 docs...' %}
{% assign search_placeholder = 'Search v2 docs...' %}

{% assign data_docs = site.data.docs %}

Expand Down
6 changes: 3 additions & 3 deletions _sass/modules/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
flex: 1;
flex-direction: column;
font-size: var(--font-size-xx-small);
gap: 0.8em;
gap: var(--space-medium);
letter-spacing: -0.01em;

ul {

align-items: center;
display: flex;
gap: 0.3em;
gap: var(--space-medium);
padding: 0;

li {
Expand All @@ -30,7 +30,7 @@
display: flex;

img {
height: 1.5em;
height: 1.75em;
width: auto;
}

Expand Down
2 changes: 1 addition & 1 deletion assets/images/logo-basecamp.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit cba5d73

Please sign in to comment.