commit 9977fb2f99108fd5ec68b07676617372d3b59a2b Author: hiro hiro@torproject.org Date: Thu Jan 16 18:19:31 2020 +0100

Update lego and templates --- databags/links.ini | 1 + databags/menu.ini | 1 + databags/menu_footer.ini | 1 + databags/{pagenav+en.ini => pagenav.ini} | 0 lego | 2 +- templates/pagenav.html | 2 +- 6 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/databags/links.ini b/databags/links.ini new file mode 120000 index 0000000..fa8bbfe --- /dev/null +++ b/databags/links.ini @@ -0,0 +1 @@ +../lego/databags/links.ini \ No newline at end of file diff --git a/databags/menu.ini b/databags/menu.ini new file mode 120000 index 0000000..94f62ff --- /dev/null +++ b/databags/menu.ini @@ -0,0 +1 @@ +../lego/databags/menu.ini \ No newline at end of file diff --git a/databags/menu_footer.ini b/databags/menu_footer.ini new file mode 120000 index 0000000..e6c1f3b --- /dev/null +++ b/databags/menu_footer.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer.ini \ No newline at end of file diff --git a/databags/pagenav+en.ini b/databags/pagenav.ini similarity index 100% rename from databags/pagenav+en.ini rename to databags/pagenav.ini diff --git a/lego b/lego index f0ea955..abbf18c 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit f0ea955c50f147813fd7735d226e7f4689e94523 +Subproject commit abbf18cb1bbca70caeb8913d2b60f0cb9332f287 diff --git a/templates/pagenav.html b/templates/pagenav.html index 0a6aa0f..7d38397 100644 --- a/templates/pagenav.html +++ b/templates/pagenav.html @@ -2,7 +2,7 @@ <div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}"> <div class="row col-12 justify-content-center"> <ul class="nav"> - {% set menubag = 'pagenav' + '+' + this.alt %} + {% set menubag = 'pagenav' %} {% for id, item in bag(menubag).items() %} {% set abs_path = item.path %} <li{% if this.is_child_of(abs_path) %} class="nav-item active border-active" {% else %} class="nav-item" {% endif %}>