Skip to content

Commit

Permalink
Update templates and icons
Browse files Browse the repository at this point in the history
  • Loading branch information
@vaclavjanak
vaclavjanak committed Apr 22, 2021
1 parent 8127c8c commit 3ea1ad7
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 26 deletions.
2 changes: 1 addition & 1 deletion icon/extra/cloud-icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion icon/extra/cluster-icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion icon/extra/data-icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion icon/extra/desktop-icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion icon/extra/engine-icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion icon/extra/server-icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 9 additions & 8 deletions templates/navbar-small.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
<svg height="46"><use href="{{ include.styles_path }}logo/maptiler-logo-adaptive-small.svg#maptilerLogo"></use></svg>
</a>

<button onclick="changeThemeColor()" class="navbar-toggler" type="button" data-toggle="collapse" data-target="#Mobilenav" aria-controls="Mobilenav" aria-expanded="false" aria-label="Toggle navigation">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 24 24">
<use href="{{ include.styles_path }}icon/icon.svg#menu"></use>
</svg>
</button>

<div class="collapse navbar-collapse navbar-mobile justify-content-end font-weight-bolder" id="Mobilenav">
<div class="navbar-nav flex-sm-row text-dark">
<div class="d-none d-md-flex">
Expand Down Expand Up @@ -44,7 +38,7 @@ <h6 class="product-title text-mobile">Mobile</h6>
</a>
</div>
</div>
<a class="nav-item nav-link mx-md-1rem" href="https://www.maptiler.com/docs/">Docs</a>
<a class="nav-item nav-link mx-md-1rem" href="{{ include.link_url }}/docs/">Docs</a>
<a class="nav-item nav-link mx-md-1rem" href="{{ include.link_url }}/news/">News</a>
</div>

Expand Down Expand Up @@ -105,6 +99,13 @@ <h6 class="product-title text-mobile">Mobile</h6>
</div>
</div>

<a class="btn btn-primary d-none d-md-block ml-3" href="{{ site.cloud.url-sign }}">My Cloud</a>
<div class="d-flex align-items-center">
<a class="btn btn-primary d-none d-md-block ml-3" href="{{ site.cloud.url-sign }}">My Cloud</a>
<button onclick="changeThemeColor()" class="navbar-toggler" type="button" data-toggle="collapse" data-target="#Mobilenav" aria-controls="Mobilenav" aria-expanded="false" aria-label="Toggle navigation">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 24 24">
<use href="{{ include.styles_path }}icon/icon.svg#menu"></use>
</svg>
</button>
</div>
</div>
</nav>
26 changes: 14 additions & 12 deletions templates/navbar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@
</a>
{% endif %}

<button onclick="changeThemeColor()" class="navbar-toggler" type="button" data-toggle="collapse" data-target="#Mobilenav" aria-controls="Mobilenav" aria-expanded="false" aria-label="Toggle navigation">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 24 24">
<use href="{{ include.styles_path }}icon/icon.svg#menu"></use>
</svg>
</button>

<div class="collapse navbar-collapse navbar-mobile justify-content-end font-weight-bolder" id="Mobilenav">
<div class="navbar-nav flex-sm-row text-dark">
<div class="d-none d-md-flex">
Expand Down Expand Up @@ -85,7 +79,7 @@ <h6 class="product-title text-mobile">Mobile</h6>
</div>
</div>

<a class="nav-item nav-link mx-md-1rem {% if page.url contains 'docs' %}active{% endif %}" href="https://www.maptiler.com/docs/">Docs</a>
<a class="nav-item nav-link mx-md-1rem {% if page.url contains 'docs' %}active{% endif %}" href="{{ include.link_url }}/docs/">Docs</a>
<a class="nav-item nav-link mx-md-1rem {% if page.url contains 'news' %}active{% endif %}" href="{{ include.link_url }}/news/">News</a>
</div>

Expand Down Expand Up @@ -147,9 +141,17 @@ <h6 class="product-title text-mobile">Mobile</h6>

</div>
</div>
{% if page.style contains 'data' %}
<a class="btn btn-primary d-none d-md-block ml-3" href="https://data.maptiler.com/my-extracts/">My Data</a>
{% else %}
<a class="btn btn-primary d-none d-md-block ml-3" href="{{ site.cloud.url-sign }}">My Cloud</a>
{% endif %}

<div class="d-flex align-items-center">
{% if page.style contains 'data' %}
<a class="btn btn-primary d-none d-md-block ml-3" href="https://data.maptiler.com/my-extracts/">My Data</a>
{% else %}
<a class="btn btn-primary d-none d-md-block ml-3" href="{{ site.cloud.url-sign }}">My Cloud</a>
{% endif %}
<button onclick="changeThemeColor()" class="navbar-toggler" type="button" data-toggle="collapse" data-target="#Mobilenav" aria-controls="Mobilenav" aria-expanded="false" aria-label="Toggle navigation">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 24 24">
<use href="{{ include.styles_path }}icon/icon.svg#menu"></use>
</svg>
</button>
</div>
</nav>

0 comments on commit 3ea1ad7

Please sign in to comment.