Skip to content

Commit c5c5add

Browse files
committed
more merge conflicts
2 parents d44f719 + 0e79c47 commit c5c5add

File tree

3 files changed

+9
-18
lines changed

3 files changed

+9
-18
lines changed

_config.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ navbar-links:
1717
Home: "index"
1818
ESMValTool:
1919
- About: "about"
20-
- Documentation: "documentation"
2120
- Gallery: "gallery"
2221
- References: "references"
2322
- Roadmap: "roadmap"
@@ -28,9 +27,12 @@ navbar-links:
2827
- Meetings: "meetings"
2928
- Publications: "publications"
3029
- Resources: "resources"
31-
Documentation: "https://docs.esmvaltool.org/en/latest/"
3230
Download: "download"
3331

32+
navbar-extlinks:
33+
Documentation: "https://docs.esmvaltool.org/"
34+
Tutorial: "https://tutorial.esmvaltool.org/"
35+
3436
# --- Logo --- #
3537

3638
# Image to show in the navigation bar - works best with a square image

_includes/nav.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
</li>
3131
{%- endif -%}
3232
{%- endfor -%}
33+
{%- for link in site.navbar-extlinks -%}
34+
<li class="nav-item">
35+
<a class="nav-link" href="{{link[1]}}"> {{link[0]}} <i class="fas fa-external-link-alt"></i></a>
36+
</li>
37+
{%- endfor -%}
3338
{% if site.post_search %}
3439
<li class="nav-item">
3540
<a class="nav-link" id="nav-search-link" href="#" title="Search">

documentation.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)