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

wip: Jd 2023 04 fontawesome 6 #2357

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

wip: Jd 2023 04 fontawesome 6 #2357

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
4 changes: 2 additions & 2 deletions adhocracy-plus/assets/scss/components/_dashboard_nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
padding: 0.7 * $spacer 2.7 * $spacer 0.7 * $spacer 1.8 * $spacer;

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

.fa-exclamation-circle,
.fa-check-circle {
.fa-circle-check {
position: absolute;
left: 0.3 * $spacer;
top: $spacer;
Expand Down
2 changes: 1 addition & 1 deletion adhocracy-plus/templates/a4ckeditor/collapsible_fragment.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
>
<h3 class="my-2">
{{ title|safe }}
<i class="fas fa-plus" aria-hidden="true"></i>
<i class="fa-solid fa-plus" aria-hidden="true"></i>
</h3>
</a>

Expand Down
6 changes: 3 additions & 3 deletions adhocracy-plus/templates/a4dashboard/base_dashboard.html
View file
Open in desktop
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="fa-solid fa-house pt-2" aria-label="{{ ORGANISATION.name }} {% translate 'Home' %}" role="img"></i>
</a>
</div>
{% endif %}
Expand All @@ -31,7 +31,7 @@
id="organisation-selection"
>
{{ view.organisation.name }}
<i class="fa fa-caret-down" aria-hidden="true"></i>
<i class="fa-solid fa-caret-down" aria-hidden="true"></i>
</button>
<div class="dropdown-menu" aria-labelledby="organisation-selection">
{% for organisation in view.other_organisations_of_user %}
Expand Down Expand Up @@ -87,7 +87,7 @@
{% else %}
{% translate 'Organisation settings' %}
{% endif %}
<i class="fa fa-caret-down" aria-hidden="true"></i>
<i class="fa-solid fa-caret-down" aria-hidden="true"></i>
</a>
<div class="dropdown-menu dropdown-menu-end">
<a
Expand Down
20 changes: 10 additions & 10 deletions adhocracy-plus/templates/a4dashboard/base_dashboard_project.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ul>
<li>
<a href="{% url 'a4dashboard:project-list' organisation_slug=view.organisation.slug %}">
<i class="fa fa-arrow-left" aria-hidden="true"></i>
<i class="fa-solid fa-arrow-left" aria-hidden="true"></i>
{% translate 'All projects' %}
</a>
</li>
Expand All @@ -33,20 +33,20 @@
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="fa-solid 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="fa-solid 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>
<i class="fa-solid fa-chevron-up" aria-hidden="true"></i>
</div>
<ul class="dashboard-nav__pages collapse{% if not project.id in closed_accordions.0 %} show{% endif %}" id="dashboardCollapseProj" aria-hidden="false">
{% for item in dashboard_menu.project %}
<li class="dashboard-nav__page">
<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-solid 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="fa-solid fa-ellipsis-vertical"></i>
</button>
<div class="dropdown-menu dropdown-menu-end" aria-labelledby="dashboardModuleMenu">
<a class="p-0" href="#">
Expand All @@ -86,12 +86,12 @@
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="fa-solid 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="fa-solid 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>
<i class="fa-solid fa-chevron-up {% if module_menu.module.is_draft %}dashboard-nav-i-spacer{% endif %}" aria-hidden="true"></i>
</div>

<ul class="dashboard-nav__pages collapse{% if not module_menu.module.pk in closed_accordions.1 %} show{% endif %}" id="dashboardCollapse_{{ forloop.counter }}" aria-hidden="false">
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-solid 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
2 changes: 1 addition & 1 deletion adhocracy-plus/templates/a4dashboard/blueprint_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ul>
<li>
<a href="{% url 'a4dashboard:project-list' organisation_slug=view.organisation.slug %}">
<i class="fa fa-arrow-left" aria-hidden="true"></i>
<i class="fa-solid fa-arrow-left" aria-hidden="true"></i>
{% translate 'All projects' %}
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion adhocracy-plus/templates/a4dashboard/includes/preview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<a href="{{ project.get_absolute_url }}"
class="btn btn--light btn--full">
<i class="fa fa-eye" aria-hidden="true"></i>
<i class="fa-solid fa-eye" aria-hidden="true"></i>
{% if project.is_draft %}
{% translate 'Preview' %}
{% else %}
Expand Down
26 changes: 13 additions & 13 deletions adhocracy-plus/templates/a4dashboard/includes/progress_line.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<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="fa-solid 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="fa-solid 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>
<i class="fa-solid 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 @@ -28,9 +28,9 @@
<span class="progress-line__line--top"></span>
<span class="progress-line__line--bottom"></span>
{% 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>
<i class="fa-solid 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="fa-solid 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 @@ -39,11 +39,11 @@
<span class="progress-line__line--top"></span>
<span class="progress-line__line--bottom"></span>
{% if dashboard_menu.modules|length == 0 %}
<i class="far fa-circle progress-line__icon" title="{% translate 'Module not ready to be filled in' %}" aria-label="{% translate 'Module not ready to be filled in' %}"></i>
<i class="fa-regular fa-circle progress-line__icon" title="{% translate 'Module not ready to be filled in' %}" aria-label="{% translate 'Module not ready to be filled in' %}"></i>
{% 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>
<i class="fa-solid 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="fa-solid 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 @@ -56,11 +56,11 @@
<span class="progress-line__line--top"></span>
<span class="progress-line__line--bottom"></span>
{% if dashboard_menu.modules|length == 0 or not dashboard_menu.modules|has_publishable_module %}
<i class="far fa-circle progress-line__icon" title="{% translate 'Module not ready to be added to project' %}" aria-label="{% translate 'Module not ready to be added to project' %}"></i>
<i class="fa-regular fa-circle progress-line__icon" title="{% translate 'Module not ready to be added to project' %}" aria-label="{% translate 'Module not ready to be added to project' %}"></i>
{% 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>
<i class="fa-solid 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="fa-solid 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 All @@ -69,9 +69,9 @@
<li class="progress-line__entry">
<span class="progress-line__line--top"></span>
{% if not project|is_publishable:project_progress %}
<i class="far fa-circle progress-line__icon" title="{% translate 'Project not ready for publication' %}" aria-label="{% translate 'Project not ready for publication' %}"></i>
<i class="fa-regular fa-circle progress-line__icon" title="{% translate 'Project not ready for publication' %}" aria-label="{% translate 'Project not ready for publication' %}"></i>
{% elif project.is_draft %}
<i class="fas fa-circle progress-line__icon--active" title="{% translate 'Project ready for publication' %}" aria-label="{% translate 'Project ready for publication' %}"></i>
<i class="fa-solid fa-circle progress-line__icon--active" title="{% translate 'Project ready for publication' %}" aria-label="{% translate 'Project ready for publication' %}"></i>
{% endif %}
<span>{% translate 'Publish project' %}</span>
</li>
Expand Down
2 changes: 1 addition & 1 deletion adhocracy-plus/templates/a4dashboard/includes/progress_line_done.html
View file
Open in desktop
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="fa-solid 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
12 changes: 6 additions & 6 deletions adhocracy-plus/templates/a4dashboard/includes/project_list_item.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h3 class="u-first-heading">
{% spaceless %}
<a href="{{ project|project_url }}"
class="btn btn--light btn--small">
<i class="fa fa-eye" aria-hidden="true"></i>
<i class="fa-solid fa-eye" aria-hidden="true"></i>
{% if project.is_draft %}
{% translate 'Preview' %}
{% else %}
Expand All @@ -38,7 +38,7 @@ <h3 class="u-first-heading">
</a>
<a href="{% url 'a4dashboard:project-edit' organisation_slug=project.organisation.slug project_slug=project.slug %}"
class="btn btn--light btn--small">
<i class="fa fa-pencil" aria-hidden="true"></i>
<i class="fa-solid fa-pencil" aria-hidden="true"></i>
{% translate 'Edit'%}
</a>
<div class="dropdown">
Expand All @@ -52,7 +52,7 @@ <h3 class="u-first-heading">
id="project-actions"
title="{% translate 'more' %}"
>
<i class="fa fa-caret-down" aria-label="{% translate 'more' %}"></i>
<i class="fa-solid fa-caret-down" aria-label="{% translate 'more' %}"></i>
</button>
<div class="dropdown-menu dropdown-menu-end
" aria-labelledby="project-actions">
Expand All @@ -61,12 +61,12 @@ <h3 class="u-first-heading">
<input type="hidden" name="project_pk" value="{{ project.pk }}">
<button type="submit" name="duplicate" value="{{ project }}"
class="dropdown-item">
<i class="far fa-copy" aria-hidden="true"></i>
<i class="fa-regular fa-copy" aria-hidden="true"></i>
{% translate 'Duplicate' %}
</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="fa-regular 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-solid fa-xmark"></i>
</button>
</div>
<div class="modal-body">
Expand Down
Loading