Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: replaces feather icons with material-symbols #287

Merged
merged 1 commit into from
Sep 21, 2023
Merged

feat: replaces feather icons with material-symbols #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 6 additions & 77 deletions apis_core/apis_entities/templates/apis_entities/detail_views/detail_generic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,7 @@
{% if object.get_prev_url %}
<h2>
<a href="{{ object.get_prev_url }}" style="float:right">
<svg xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
class="feather feather-chevron-left">
<polyline points="15 18 9 12 15 6" />
</svg>
<span class="material-symbols-outlined">chevron_left</span>
</a>
</h2>
{% endif %}
Expand All @@ -64,57 +53,21 @@ <h2 style="text-align: center;">
{% if user.is_authenticated %}
{% if object.get_edit_url %}
<a href="{{ object.get_edit_url }}">
<svg width="24"
height="24"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
class="feather feather-edit">
<path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7" />
<path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z" />
</svg>
<span class="material-symbols-outlined">edit</span>
</a>
{% endif %}

{% if object.get_delete_url %}
|
<a href="{{ object.get_delete_url }}">
<svg xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
class="feather feather-trash">
<polyline points="3 6 5 6 21 6" />
<path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2" />
</svg>
<span class="material-symbols-outlined">delete</span>
</a>
{% endif %}

{% if object.get_duplicate_url %}
|
<a href="{{ object.get_duplicate_url }}" title="Duplicate">
<svg xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
class="feather feather-copy">
<rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
<path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
</svg>
<span class="material-symbols-outlined">content_copy</span>
</a>
{% endif %}
{% endif %}
Expand All @@ -131,18 +84,7 @@ <h2 style="text-align: center;">
{% if object.get_next_url %}
<h2>
<a href="{{ object.get_next_url }}" style="float:left">
<svg xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
class="feather feather-chevron-right">
<polyline points="9 18 15 12 9 6" />
</svg>
<span class="material-symbols-outlined">chevron_right</span>
</a>
</h2>
{% endif %}
Expand All @@ -159,20 +101,7 @@ <h3>
General Info
<a href="/entity/{{ object.id }}">
<small>
<svg xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
class="feather feather-database">
<ellipse cx="12" cy="5" rx="9" ry="3" />
<path d="M21 12c0 1.66-4 3-9 3s-9-1.34-9-3" />
<path d="M3 5v14c0 1.66 4 3 9 3s9-1.34 9-3V5" />
</svg>
<span class="material-symbols-outlined">database</span>
</small>
</a>
</h3>
Expand Down
4 changes: 2 additions & 2 deletions apis_core/apis_entities/templates/apis_entities/edit_generic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ <h1>
<small>{{ entity_type }}s</small>
</a>
<strong>{{ instance }}</strong> <a href="{{ instance.get_absolute_url }}">
<i data-feather="eye" title="eye"></i>
<span class="material-symbols-outlined">visibility</span>
</a>
<a href="/entity/{{ instance.id }}">
<i data-feather="database" title="database"></i>
<span class="material-symbols-outlined">database</span>
</a>
</h1>
</div>
Expand Down
8 changes: 4 additions & 4 deletions apis_core/apis_metainfo/templates/apis_metainfo/uri_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{% if object.get_prev_url %}
<h2>
<a href="{{ object.get_prev_url }}" style="float:right">
<i data-feather="chevron-left" title="previous"></i>
<span class="material-symbols-outlined">chevron_left</span>
</a>
</h2>
{% endif %}
Expand All @@ -40,14 +40,14 @@ <h2 style="text-align: center;">
{% if user.is_authenticated %}
{% if object.get_edit_url %}
<a href="{{ object.get_edit_url }}">
<i class="feather-32" data-feather="edit" title="edit"></i>
<span class="material-symbols-outlined">edit</span>
</a>
{% endif %}

{% if object.get_delete_url %}
|
<a href="{{ object.get_delete_url }}">
<i class="feather-32" data-feather="trash" title="delete"></i>
<span class="material-symbols-outlined">delete_forever</span>
</a>
{% endif %}
{% endif %}
Expand All @@ -59,7 +59,7 @@ <h2 style="text-align: center;">
{% if object.get_next_url %}
<h2>
<a href="{{ object.get_next_url }}" style="float:left">
<i data-feather="chevron-right" title="next"></i>
<span class="material-symbols-outlined">chevron_right</span>
</a>
</h2>
{% endif %}
Expand Down
7 changes: 4 additions & 3 deletions apis_core/apis_metainfo/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
<link rel="mask-icon"
href="{{ SHARED_URL }}favicon/safari-pinned-tab.svg"
color="#00aba9" />
<link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined"
rel="stylesheet" />

{% block styles %}
{% include "partials/bootstrap4_css.html" %}
Expand Down Expand Up @@ -145,7 +147,7 @@
<div class="dropdown-menu dropdown-menu-right">
<div class="dropdown-item">
<a class="nav-link p-0" href="{% url 'admin:logout' %}">
<span class="feather-32" data-feather="log-out"></span>
<span class="material-symbols-outlined">logout</span>
log out
</a>
</div>
Expand All @@ -155,7 +157,7 @@
<li class="nav-item dropdown ml-auto">
<a class="nav-link p-0"
href="{% url 'admin:login' %}?next={{ request.path|urlencode }}">
<span class="feather-32" data-feather="log-in"></span>
<span class="material-symbols-outlined">login</span>
</a>
</li>
{% endif %}
Expand Down Expand Up @@ -225,7 +227,6 @@
</div>

{% block scripts %}
{% include "partials/feather_js.html" %}
{% include "partials/bootstrap4_js.html" %}
<script type="text/javascript"
src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.1/js/bootstrap-select.min.js"></script>
Expand Down
3 changes: 0 additions & 3 deletions apis_core/apis_metainfo/templates/partials/feather_js.html
View file
Open in desktop

This file was deleted.

14 changes: 1 addition & 13 deletions apis_core/apis_relations/templates/apis_relations/delete_button_generic_ajax_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,5 @@
{# djlint:off #}
<a id="tempEntity_{% if record.relation_pk %}{{ record.relation_pk }}{% else %}{{ record.pk }}{% endif %}" class="reldelete" aria-label="Left Align" onclick=DeleteTempEntity('{% if record.relation_pk %}{{ record.relation_pk }}{% else %}{{ record.pk }}{% endif %}',"relations/{{ record|content_type|lower }}")>
{# djlint:on #}
<svg xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
class="feather feather-trash">
<polyline points="3 6 5 6 21 6"></polyline>
<path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path>
</svg>
<span class="material-symbols-outlined">delete</span>
</a>
13 changes: 1 addition & 12 deletions apis_core/apis_relations/templates/apis_relations/edit_button_generic_ajax_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,5 @@
{# djlint:off #}
<a class='reledit' onclick=GetFormAjax(null,"{% if record.relation_pk %}{{ record.relation_pk }}{% else %}{{ record.pk }}{% endif %}")>
{# djlint:on #}
<svg xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
class="feather feather-edit-2">
<polygon points="16 3 21 8 8 21 3 21 3 16 16 3"></polygon>
</svg>
<span class="material-symbols-outlined">edit</span>
</a>
14 changes: 1 addition & 13 deletions apis_core/apis_relations/templates/apis_relations/references_button_generic_ajax_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,5 @@
<a class="bibsonomy-anker" data-bibs-contenttype="{{ record|content_type|lower }}" data-bibs-object_pk="
{% if record.relation_pk %}{{ record.relation_pk }}{% else %}{{ record.pk }}{% endif %}
">
<svg xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
class="feather feather-book-open">
<path d="M2 3h6a4 4 0 0 1 4 4v14a3 3 0 0 0-3-3H2z"></path>
<path d="M22 3h-6a4 4 0 0 0-4 4v14a3 3 0 0 1 3-3h7z"></path>
</svg>
<span class="material-symbols-outlined">import_contacts</span>
</a>