update to fontawesome v6

* rename icons to new v6 names * rename fas -> fa-solid * rename far -> fa-regular
liqd · Apr 20, 2023 · 3e921f4 · 3e921f4
1 parent 4684346
commit 3e921f4
Show file tree

Hide file tree

Showing 56 changed files with 163 additions and 163 deletions.
diff --git a/adhocracy-plus/assets/scss/components/_dashboard_nav.scss b/adhocracy-plus/assets/scss/components/_dashboard_nav.scss
@@ -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;
@@ -61,7 +61,7 @@
     }
 
     .fa-exclamation-circle,
-    .fa-check-circle {
+    .fa-circle-check {
         position: absolute;
         left: 0.3 * $spacer;
         top: $spacer;

diff --git a/adhocracy-plus/templates/a4ckeditor/collapsible_fragment.html b/adhocracy-plus/templates/a4ckeditor/collapsible_fragment.html
@@ -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>
 

diff --git a/adhocracy-plus/templates/a4dashboard/base_dashboard.html b/adhocracy-plus/templates/a4dashboard/base_dashboard.html
@@ -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 %}

diff --git a/adhocracy-plus/templates/a4dashboard/base_dashboard_project.html b/adhocracy-plus/templates/a4dashboard/base_dashboard_project.html
@@ -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="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>
@@ -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>
@@ -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="#">
@@ -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="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>
@@ -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>

diff --git a/adhocracy-plus/templates/a4dashboard/includes/progress_line.html b/adhocracy-plus/templates/a4dashboard/includes/progress_line.html
@@ -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 %}
 
 
@@ -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>
@@ -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 %}>
@@ -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>
@@ -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>

diff --git a/adhocracy-plus/templates/a4dashboard/includes/progress_line_done.html b/adhocracy-plus/templates/a4dashboard/includes/progress_line_done.html
@@ -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"

diff --git a/adhocracy-plus/templates/a4dashboard/includes/project_list_item.html b/adhocracy-plus/templates/a4dashboard/includes/project_list_item.html
@@ -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>
@@ -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">

diff --git a/adhocracy-plus/templates/a4dashboard/organisation_form_base.html b/adhocracy-plus/templates/a4dashboard/organisation_form_base.html
@@ -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>
@@ -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>

diff --git a/adhocracy-plus/templates/a4filters/widgets/free_text_filter.html b/adhocracy-plus/templates/a4filters/widgets/free_text_filter.html
@@ -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>
diff --git a/adhocracy-plus/templates/a4forms/includes/inline_form.html b/adhocracy-plus/templates/a4forms/includes/inline_form.html
@@ -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="fa-regular fa-trash-can" aria-label="{% translate 'Remove item' %}"></i>
             </label>
         {% endif %}
         {% for hidden in form.hidden_fields %}

diff --git a/adhocracy-plus/templates/a4images/image_upload_widget.html b/adhocracy-plus/templates/a4images/image_upload_widget.html
@@ -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="fa-regular 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="fa-solid fa-cloud-arrow-up" aria-label="{% translate 'Upload a picture' %}"></i>
             </label>
         {% endif %}
         </div>

diff --git a/adhocracy-plus/templates/a4images/image_upload_widget_simple.html b/adhocracy-plus/templates/a4images/image_upload_widget_simple.html
@@ -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="fa-regular 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="fa-solid fa-cloud-arrow-up" aria-label="{% translate 'Upload a picture' %}"></i>
             </label>
         {% endif %}
         </div>

diff --git a/adhocracy-plus/templates/a4modules/module_detail.html b/adhocracy-plus/templates/a4modules/module_detail.html
@@ -169,13 +169,13 @@ <h1 class="project-header__title">{{ module.name }}</h1>
         {% if project.is_private %}
         <div class="row">
             <div class="col-md-10 col-lg-8 offset-md-1 offset-lg-2 u-font-size-xs mb-4">
-                <i class="fas fa-lock pe-2" aria-hidden="true"></i>{% translate 'This project is not publicly visible. Only invited users can see content and actively participate.' %}
+                <i class="fa-solid fa-lock pe-2" aria-hidden="true"></i>{% translate 'This project is not publicly visible. Only invited users can see content and actively participate.' %}
             </div>
         </div>
         {% elif project.is_semipublic %}
         <div class="row">
             <div class="col-md-10 col-lg-8 offset-md-1 offset-lg-2 u-font-size-xs mb-4">
-                <i class="fas fa-eye pe-2" aria-hidden="true"></i>{% translate 'This project is publicly visible. Invited users can actively participate.' %}
+                <i class="fa-solid fa-eye pe-2" aria-hidden="true"></i>{% translate 'This project is publicly visible. Invited users can actively participate.' %}
             </div>
         </div>
         {% endif %}

diff --git a/apps/account/sedHHO3pu b/apps/account/sedHHO3pu