Skip to content

Commit

Permalink
rename fontawesome icons to v6
Browse files Browse the repository at this point in the history
  • Loading branch information
goapunk committed Apr 18, 2023
1 parent e545672 commit 1fdee8c
Show file tree
Hide file tree
Showing 39 changed files with 81 additions and 81 deletions.
8 changes: 4 additions & 4 deletions adhocracy-plus/assets/scss/components/_dashboard_nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
position: relative;
padding: 0.7 * $spacer 2.7 * $spacer 0.7 * $spacer 1.8 * $spacer;

.fa-exclamation-circle,
.fa-check-circle {
.fa-circle-exclamation,
.fa-circle-check {
position: absolute;
left: 0.5 * $spacer;
top: $spacer;
Expand Down Expand Up @@ -60,8 +60,8 @@
margin: 0;
}

.fa-exclamation-circle,
.fa-check-circle {
.fa-circle-exclamation,
.fa-circle-check {
position: absolute;
left: 0.3 * $spacer;
top: $spacer;
Expand Down
2 changes: 1 addition & 1 deletion adhocracy-plus/templates/a4dashboard/base_dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{% else %}
<div class="dashboard-nav__logo-link">
<a class="font-weight-bold" href="{% url 'organisation' organisation_slug=ORGANISATION.slug %}">
<i class="fas fa-home pt-2" aria-label="{{ ORGANISATION.name }} {% translate 'Home' %}" role="img"></i>
<i class="fas fa-house pt-2" aria-label="{{ ORGANISATION.name }} {% translate 'Home' %}" role="img"></i>
</a>
</div>
{% endif %}
Expand Down
14 changes: 7 additions & 7 deletions adhocracy-plus/templates/a4dashboard/base_dashboard_project.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
data-bs-target="#dashboardCollapseProj"
>
{% if project_progress.project_is_complete %}
<i class="fas fa-check-circle text-info" title="{% translate 'Project ready for publication' %}" aria-label="{% translate 'Project ready for publication' %}"></i>
<i class="fas fa-circle-check text-info" title="{% translate 'Project ready for publication' %}" aria-label="{% translate 'Project ready for publication' %}"></i>
{% else %}
<i class="fas fa-exclamation-circle text-danger" title="{% translate 'Project not ready for publication' %}" aria-label="{% translate 'Project not ready for publication' %}"></i>
<i class="fas fa-circle-exclamation text-danger" title="{% translate 'Project not ready for publication' %}" aria-label="{% translate 'Project not ready for publication' %}"></i>
{% endif %}
{{ project.name }}
<i class="fa fa-chevron-up" aria-hidden="true"></i>
Expand All @@ -46,7 +46,7 @@
<a href="{{ item.url }}"
class="dashboard-nav__item dashboard-nav__item--interactive {{ item.is_active|yesno:"is-active," }}">
{% if not item.is_complete %}
<i class="fa fa-exclamation-circle text-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
<i class="fa fa-circle-exclamation text-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
{% endif %}
{{ item.label }}
</a>
Expand All @@ -60,7 +60,7 @@
{% if module_menu.module.is_draft %}
<div class="btn btn--none px-0 dropdown dashboard-nav__module-dropdown">
<button class="dropdown-toggle" id="dashboardModuleMenu" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-ellipsis-v"></i>
<i class="fas fa-ellipsis-vertical"></i>
</button>
<div class="dropdown-menu dropdown-menu-end" aria-labelledby="dashboardModuleMenu">
<a class="p-0" href="#">
Expand All @@ -86,9 +86,9 @@
data-bs-target="#dashboardCollapse_{{ forloop.counter }}"
>
{% if module_menu.is_complete %}
<i class="fas fa-check-circle text-info" title="{% translate 'Module ready for addition' %}" aria-label="{% translate 'Module ready for addition' %}"></i>
<i class="fas fa-circle-check text-info" title="{% translate 'Module ready for addition' %}" aria-label="{% translate 'Module ready for addition' %}"></i>
{% else %}
<i class="fas fa-exclamation-circle text-danger" title="{% translate 'Module not ready for addition' %}" aria-label="{% translate 'Module not ready for addition' %}"></i>
<i class="fas fa-circle-exclamation text-danger" title="{% translate 'Module not ready for addition' %}" aria-label="{% translate 'Module not ready for addition' %}"></i>
{% endif %}
{{ module_menu.module.name }}
<i class="fa fa-chevron-up {% if module_menu.module.is_draft %}dashboard-nav-i-spacer{% endif %}" aria-hidden="true"></i>
Expand All @@ -100,7 +100,7 @@
<a href="{{ item.url }}"
class="dashboard-nav__item dashboard-nav__item--interactive {{ item.is_active|yesno:"is-active," }}">
{% if not item.is_complete %}
<i class="fa fa-exclamation-circle text-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
<i class="fa fa-circle-exclamation text-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
{% endif %}
{{ item.label }}
</a>
Expand Down
10 changes: 5 additions & 5 deletions adhocracy-plus/templates/a4dashboard/includes/progress_line.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<ul class="progress-line u-spacer-bottom">
<li class="progress-line__entry">
<span class="progress-line__line--bottom"></span>
<i class="fas fa-check-circle progress-line__icon progress-line__icon--success" title="{% translate 'Project created' %}" aria-label="{% translate 'Project created' %}"></i>
<i class="fas fa-circle-check progress-line__icon progress-line__icon--success" title="{% translate 'Project created' %}" aria-label="{% translate 'Project created' %}"></i>
<span>{% translate 'Create project' %}</span>
</li>

<li class="progress-line__entry">
<span class="progress-line__line--top"></span>
<span class="progress-line__line--bottom"></span>
{% if project_progress.project_is_complete %}
<i class="fas fa-check-circle progress-line__icon progress-line__icon--success" title="{% translate 'Project ready for publication' %}" aria-label="{% translate 'Project ready for publication' %}"></i>
<i class="fas fa-circle-check progress-line__icon progress-line__icon--success" title="{% translate 'Project ready for publication' %}" aria-label="{% translate 'Project ready for publication' %}"></i>
{% else %}
<i class="fas fa-circle progress-line__icon--active" title="{% translate 'Project not ready for publication' %}" aria-label="{% translate 'Project not ready for publication' %}"></i>
{% endif %}
Expand All @@ -30,7 +30,7 @@
{% if dashboard_menu.modules|length == 0 %}
<i class="fas fa-circle progress-line__icon--active" title="{% translate 'No module created' %}" aria-label="{% translate 'No module created' %}"></i>
{% else %}
<i class="fas fa-check-circle progress-line__icon progress-line__icon--success" title="{% translate 'Module created' %}" aria-label="{% translate 'Module created' %}"></i>
<i class="fas fa-circle-check progress-line__icon progress-line__icon--success" title="{% translate 'Module created' %}" aria-label="{% translate 'Module created' %}"></i>
{% endif %}
<span>{% translate 'Add participation module(s)' %}</span>
</li>
Expand All @@ -43,7 +43,7 @@
{% elif not dashboard_menu.modules|has_publishable_module %}
<i class="fas fa-circle progress-line__icon--active" title="{% translate 'Fill in module details' %}" aria-label="{% translate 'Fill in module details' %}"></i>
{% else %}
<i class="fas fa-check-circle progress-line__icon progress-line__icon--success" title="{% translate 'Module ready to be added to project' %}" aria-label="{% translate 'Module ready to be added to project' %}"></i>
<i class="fas fa-circle-check progress-line__icon progress-line__icon--success" title="{% translate 'Module ready to be added to project' %}" aria-label="{% translate 'Module ready to be added to project' %}"></i>
{% endif %}

<span {% if dashboard_menu.modules|module_nav_is_active %}class="progress-line__entry--active"{% endif %}>
Expand All @@ -60,7 +60,7 @@
{% elif dashboard_menu.modules|has_publishable_module and project.published_modules.count == 0 %}
<i class="fas fa-circle progress-line__icon--active" title="{% translate 'Show module(s) in project' %}" aria-label="{% translate 'Show module(s) in project' %}"></i>
{% else %}
<i class="fas fa-check-circle progress-line__icon progress-line__icon--success" title="{% translate 'Module added to project' %}" aria-label="{% translate 'Module added to project' %}"></i>
<i class="fas fa-circle-check progress-line__icon progress-line__icon--success" title="{% translate 'Module added to project' %}" aria-label="{% translate 'Module added to project' %}"></i>
{% endif %}
<span>{% translate 'Add module(s) to project' %}</span>
</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ul class="progress-line u-spacer-bottom">
<li class="progress-line__entry--published">
<i
class="fas fa-check-circle progress-line__icon progress-line__icon--success"
class="fas fa-circle-check progress-line__icon progress-line__icon--success"
title="{% translate 'Project type has been published' %}"
aria-label="{% translate 'Project type has been published' %}"
role="img"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ <h3 class="u-first-heading">
</button>
</form>
<a href="#" class="dropdown-item font-weight-normal" data-bs-toggle="modal" data-bs-target="#project{{ project.pk }}DeleteModal">
<i class="far fa-trash-alt" aria-hidden="true"></i>
<i class="far fa-trash-can" aria-hidden="true"></i>
{% translate 'delete' %}
</a>
</div>
Expand All @@ -90,7 +90,7 @@ <h2 className="u-no-margin-bottom u-spacer-top-one-half">
{% translate 'delete' %}
</h2>
<button class="close" data-bs-dismiss="modal" aria-label="Close">
<i class="fa fa-times"></i>
<i class="fa fa-xmark"></i>
</button>
</div>
<div class="modal-body">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
class="dashboard-nav__item dashboard-nav__item--interactive {% if request.resolver_match.url_name == 'organisation-settings' %}is-active{% endif %}">
{% translate "General information" %}
{% if not object.title %}
<i class="fa fa-exclamation-circle text-danger" title="{% translate 'Missing important fields' %}" aria-label="{% translate 'Missing important fields' %}"></i>
<i class="fa fa-circle-exclamation text-danger" title="{% translate 'Missing important fields' %}" aria-label="{% translate 'Missing important fields' %}"></i>
{% endif %}

</a>
Expand All @@ -25,7 +25,7 @@
class="dashboard-nav__item dashboard-nav__item--interactive {% if request.resolver_match.url_name == 'organisation-legal-information' %}is-active{% endif %}">
{% translate "Legal information" %}
{% if not object.imprint or not object.terms_of_use or not object.data_protection %}
<i class="fa fa-exclamation-circle text-danger" title="{% translate 'Missing important fields' %}" aria-label="{% translate 'Missing important fields' %}"></i>
<i class="fa fa-circle-exclamation text-danger" title="{% translate 'Missing important fields' %}" aria-label="{% translate 'Missing important fields' %}"></i>
{% endif %}
</a>
</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
{% endif %}
{% endfor %}
<button class="btn btn--light" type="submit" title="{% translate 'Search' %}">
<i class="fa fa-search" aria-label="{% translate 'Search' %}"></i>
<i class="fa fa-magnifying-glass" aria-label="{% translate 'Search' %}"></i>
</button>
</form>
4 changes: 2 additions & 2 deletions adhocracy-plus/templates/a4forms/includes/inline_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@

{% if not form.name.value %}
<button type="button" class="category-formset__delete-label js-remove-form" title="{% translate 'Remove item' %}">
<i class="fa fa-times" aria-label="{% translate 'Remove item' %}"></i>
<i class="fa fa-xmark" aria-label="{% translate 'Remove item' %}"></i>
</button>
{% elif can_delete %}
<label for="{{ form.DELETE.id_for_label }}" class="category-formset__delete-label" title="{% translate 'Remove item' %}">
<i class="far fa-trash-alt" aria-label="{% translate 'Remove item' %}"></i>
<i class="far fa-trash-can" aria-label="{% translate 'Remove item' %}"></i>
</label>
{% endif %}
{% for hidden in form.hidden_fields %}
Expand Down
4 changes: 2 additions & 2 deletions adhocracy-plus/templates/a4images/image_upload_widget.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<label for="{{ checkbox_id }}"
class="upload-wrapper__action btn btn--danger"
title="{% translate 'Remove the picture' %}">
<i class="far fa-trash-alt" aria-label="{% translate 'Remove the picture' %}"></i>
<i class="far fa-trash-can" aria-label="{% translate 'Remove the picture' %}"></i>
</label>
{% else %}
<label for="{{ id }}"
class="upload-wrapper__action btn btn--default"
title="{% translate 'Upload a picture' %}">
<i class="fas fa-cloud-upload-alt" aria-label="{% translate 'Upload a picture' %}"></i>
<i class="fas fa-cloud-arrow-up-alt" aria-label="{% translate 'Upload a picture' %}"></i>
</label>
{% endif %}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<label for="{{ checkbox_id }}"
class="upload-wrapper__action btn btn--danger"
title="{% translate 'Remove the picture' %}">
<i class="far fa-trash-alt" aria-label="{% translate 'Remove the picture' %}"></i>
<i class="far fa-trash-can" aria-label="{% translate 'Remove the picture' %}"></i>
</label>
{% else %}
<label for="{{ id }}"
class="upload-wrapper__action btn btn--default"
title="{% translate 'Upload a picture' %}">
<i class="fas fa-cloud-upload-alt" aria-label="{% translate 'Upload a picture' %}"></i>
<i class="fas fa-cloud-arrow-up-alt" aria-label="{% translate 'Upload a picture' %}"></i>
</label>
{% endif %}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<li class="dashboard-nav__page">
<a href="{% url 'user_agreements' %}"
class="dashboard-nav__item dashboard-nav__item--interactive {% if request.resolver_match.url_name == "user_agreements" %}is-active{% endif %}">
<i class="far fa-check-square" aria-hidden="true"></i>
<i class="far fa-square-check" aria-hidden="true"></i>
{% translate 'User Agreements' %}
</a>
</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h3 class="u-first-heading">
<span class="label label--big">{{ object.category }}</span>
{% endif %}
{% if object.point_label %}
<span class="label label--big"><i class="fas fa-map-marker-alt" aria-hidden="true"></i> {{ object.point_label }}</span>
<span class="label label--big"><i class="fas fa-location-pin-alt" aria-hidden="true"></i> {{ object.point_label }}</span>
{% endif %}
{% if object.budget > 0 %}
<span class="label label--big">{{ object.budget|intcomma }}€</span>
Expand Down
Loading

0 comments on commit 1fdee8c

Please sign in to comment.