Merge upstream
This commit is contained in:
@@ -7,49 +7,47 @@
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
{% if site.title-img %}
|
||||
<a class="navbar-brand navbar-brand-logo" href="{{ site.url }}"><img src="{{ site.title-img }}"/></a>
|
||||
{% else %}
|
||||
<a class="navbar-brand" href="{{ site.url }}">{{ site.title }}</a>
|
||||
{% endif %}
|
||||
{%- if site.title-img -%}
|
||||
<a class="navbar-brand navbar-brand-logo" href="{{ '' | absolute_url }}"><img src="{{ site.title-img }}"/></a>
|
||||
{%- else -%}
|
||||
<a class="navbar-brand" href="{{ '' | absolute_url }}">{{ site.title }}</a>
|
||||
{%- endif -%}
|
||||
</div>
|
||||
|
||||
<div class="collapse navbar-collapse" id="main-navbar">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
{% for link in site.navbar-links %}
|
||||
{% if link[1].first %}
|
||||
{%- for link in site.navbar-links -%}
|
||||
{%- if link[1].first %}
|
||||
<li class="navlinks-container">
|
||||
<a class="navlinks-parent" href="javascript:void(0)">{{ link[0] }}</a>
|
||||
<div class="navlinks-children">
|
||||
{% for childlink in link[1] %}
|
||||
{% for linkparts in childlink %}
|
||||
{% include navbarlink.html link=linkparts %}
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
{%- for childlink in link[1] -%}
|
||||
{%- for linkparts in childlink %}
|
||||
<a href="{{ linkparts[1] | relative_url }}">{{ linkparts[0] }}</a>
|
||||
{%- endfor -%}
|
||||
{%- endfor %}
|
||||
</div>
|
||||
</li>
|
||||
{% else %}
|
||||
<li>
|
||||
{% include navbarlink.html link=link %}
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<li><a href="{{ link[1] | relative_url }}">{{ link[0] }}</a></li>
|
||||
{%- endif -%}
|
||||
{%- endfor -%}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
{% if page.image and (layout.show-avatar or page.show-avatar) %}
|
||||
<div class="avatar-container">
|
||||
<div class="avatar-img-border">
|
||||
<a href="{{ site.url }}">
|
||||
<img class="avatar-img" src="{{ page.image | prepend: site.baseurl | replace: '//', '/' }}" />
|
||||
<a href="{{ '' | absolute_url }}">
|
||||
<img class="avatar-img" src="{{ page.image | relative_url }}" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
{% elsif site.avatar and (layout.show-avatar or page.show-avatar) %}
|
||||
<div class="avatar-container">
|
||||
<div class="avatar-img-border">
|
||||
<a href="{{ site.url }} ">
|
||||
<img class="avatar-img" src="{{ site.avatar | prepend: site.baseurl | replace: '//', '/' }}" />
|
||||
<a href="{{ '' | absolute_url }}">
|
||||
<img class="avatar-img" src="{{ site.avatar | relative_url }}" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user