rename fas -> fa-solid

Julian Dehm · Julian Dehm · commit c39aedb5c2dc · 2023-04-20T15:53:28.000+02:00
diff --git a/adhocracy4/comments_async/static/comments_async/comment.jsx b/adhocracy4/comments_async/static/comments_async/comment.jsx
@@ -325,7 +325,7 @@ export default class Comment extends React.Component {
     return (
       <div>
         {this.state.displayNotification &&
-          <div className="alert alert--success a4-comments__success-notification"><i className="fas fa-check" /> {translated.successMessage}</div>}
+          <div className="alert alert--success a4-comments__success-notification"><i className="fa-solid fa-check" /> {translated.successMessage}</div>}
         <div className={(this.props.is_users_own_comment ? 'a4-comments__comment a4-comments__comment-owner' : 'a4-comments__comment')}>
           <a className="a4-comments__anchor" id={'comment_' + this.props.id} href={'./?comment=' + this.props.id}>{'Comment ' + this.props.id}</a>
           <ReportModal
@@ -433,14 +433,14 @@ export default class Comment extends React.Component {
                     <a
                       className="btn btn--no-border a4-comments__action-bar__btn" href={'?comment_' + this.props.id}
                       data-bs-toggle="modal" data-bs-target={'#share_comment_' + this.props.id}
-                    ><i className="fas fa-share" /> {translated.share}
+                    ><i className="fa-solid fa-share" /> {translated.share}
                     </a>}
 
                   {!this.props.is_deleted && this.props.authenticated_user_pk && !this.props.is_users_own_comment &&
                     <a
                       className="btn btn--no-border a4-comments__action-bar__btn" href={'#report_comment_' + this.props.id}
                       data-bs-toggle="modal"
-                    ><i className="fas fa-triangle-exclamation" />{translated.report}
+                    ><i className="fa-solid fa-triangle-exclamation" />{translated.report}
                     </a>}
 
                 </div>
diff --git a/adhocracy4/comments_async/static/comments_async/comment_box.jsx b/adhocracy4/comments_async/static/comments_async/comment_box.jsx
@@ -479,7 +479,7 @@ export const CommentBox = (props) => {
               onClick={handleToggleFilters}
             >
               <i
-                className="fas fa-sliders ms-2"
+                className="fa-solid fa-sliders ms-2"
                 aria-label={translated.showFilters}
               />
               {translated.filters}
@@ -492,7 +492,7 @@ export const CommentBox = (props) => {
               onClick={handleToggleFilters}
             >
               <i
-                className="fas fa-xmark ms-2"
+                className="fa-solid fa-xmark ms-2"
                 aria-label={translated.hideFilters}
               />
               {translated.hideFilters}
diff --git a/adhocracy4/comments_async/static/comments_async/comment_manage_dropdown.jsx b/adhocracy4/comments_async/static/comments_async/comment_manage_dropdown.jsx
@@ -16,7 +16,7 @@ const CommentManageDropdown = (props) => {
         aria-expanded="false"
         data-bs-toggle="dropdown"
       >
-        <i className="fas fa-ellipsis" aria-hidden="true" />
+        <i className="fa-solid fa-ellipsis" aria-hidden="true" />
       </button>
       <div className="dropdown-menu dropdown-menu-end">
         {props.has_changing_permission && [
diff --git a/adhocracy4/comments_async/static/comments_async/filter_category.jsx b/adhocracy4/comments_async/static/comments_async/filter_category.jsx
@@ -21,7 +21,7 @@ export const FilterCategory = ({
           <span className={filter === 'all' ? 'a4-comments__filters__btn-text' : 'd-none'}>{translated.display}{filterDisplay}</span>
           <span className={filter !== 'all' ? 'a4-comments__filters__btn-text small-screen' : 'd-none'}>{filterDisplay}</span>
 
-          <i className={filter === 'all' ? 'fa fa-caret-down' : 'fas fa-check'} aria-hidden="true" />
+          <i className={filter === 'all' ? 'fa fa-caret-down' : 'fa-solid fa-check'} aria-hidden="true" />
         </button>
         <div className="dropdown-menu dropend" aria-labelledby="categoryDropdownBtn">
           {filter !== 'all' &&
diff --git a/adhocracy4/comments_async/static/comments_async/filter_search.jsx b/adhocracy4/comments_async/static/comments_async/filter_search.jsx
@@ -41,7 +41,7 @@ export const FilterSearch = ({
       >
         <span className="fa-stack fa-2x">
           <i className="far fa-circle fa-stack-2x" />
-          <i className="fas fa-xmark fa-stack-1x" aria-label={translated.clearSearch} />
+          <i className="fa-solid fa-xmark fa-stack-1x" aria-label={translated.clearSearch} />
         </span>
       </button>
 
@@ -50,7 +50,7 @@ export const FilterSearch = ({
         type="button"
         onClick={() => onSearch(query)}
       >
-        <i className="fas fa-magnifying-glass" aria-label={translated.searchContrib} />
+        <i className="fa-solid fa-magnifying-glass" aria-label={translated.searchContrib} />
       </button>
     </div>
   )
diff --git a/adhocracy4/comments_async/static/comments_async/filter_sort.jsx b/adhocracy4/comments_async/static/comments_async/filter_sort.jsx
@@ -19,7 +19,7 @@ export const FilterSort = ({
         >
           <span className={sort === 'new' ? 'a4-comments__filters__btn-text' : 'd-none'}>{translated.sortedBy}{sorts[sort]}</span>
           <span className={sort !== 'new' ? 'a4-comments__filters__btn-text small-screen' : 'd-none'}>{sorts[sort]}</span>
-          <i className={sort === 'new' ? 'fa fa-caret-down' : 'fas fa-check'} aria-hidden="true" />
+          <i className={sort === 'new' ? 'fa fa-caret-down' : 'fa-solid fa-check'} aria-hidden="true" />
         </button>
         <div className="dropdown-menu dropdown-menu-end" aria-labelledby="sortDropdownBtn">
           {Object.keys(sorts).map(objectKey => {
diff --git a/adhocracy4/comments_async/static/comments_async/moderator_feedback.jsx b/adhocracy4/comments_async/static/comments_async/moderator_feedback.jsx
@@ -7,7 +7,7 @@ export const ModeratorFeedback = ({ lastEdit, feedbackText }) => {
   return (
     <div className="row">
       <div className="a4-comments__moderator-feedback__container">
-        <i className="fas fa-share a4-comments__moderator-feedback__icon" />
+        <i className="fa-solid fa-share a4-comments__moderator-feedback__icon" />
         <div className="a4-comments__moderator-feedback__content">
           <div className="a4-comments__moderator-feedback__moderator">
             {translated.moderator}
diff --git a/adhocracy4/dashboard/templates/a4dashboard/project_list.html b/adhocracy4/dashboard/templates/a4dashboard/project_list.html
@@ -44,7 +44,7 @@ <h2>
 
                     <a href="{% url 'a4dashboard:project-edit' project_slug=project.slug %}"
                        class="btn btn--light btn--small">
-                        <i class="fas fa-pencil" aria-hidden="true"></i>
+                        <i class="fa-solid fa-pencil" aria-hidden="true"></i>
                         {% translate 'Edit' %}
                     </a>
 
diff --git a/adhocracy4/forms/templates/a4forms/includes/inline_form.html b/adhocracy4/forms/templates/a4forms/includes/inline_form.html
@@ -16,7 +16,7 @@
             </button>
         {% elif can_delete %}
             <label for="{{ form.DELETE.id_for_label }}" class="category-formset__delete-label" title="{% translate 'Remove category' %}">
-                <i class="fas fa-trash-can" aria-label="{% translate 'Remove category' %}"></i>
+                <i class="fa-solid fa-trash-can" aria-label="{% translate 'Remove category' %}"></i>
             </label>
         {% endif %}
         {% for hidden in form.hidden_fields %}
diff --git a/adhocracy4/images/templates/a4images/image_upload_widget.html b/adhocracy4/images/templates/a4images/image_upload_widget.html
@@ -6,11 +6,11 @@
             {% if has_image_set and not is_required %}
             <label for="{{ checkbox_id }}" class="btn btn-danger"
                    title="{% translate 'Remove the picture' %}">
-                <i class="fas fa-trash-can"></i>
+                <i class="fa-solid fa-trash-can"></i>
             </label>
             {% else %}
             <label for="{{ id }}" class="btn btn-default" title="{% translate  'Upload a picture' %}">
-                <i class="fas fa-cloud-arrow-up-alt"></i>
+                <i class="fa-solid fa-cloud-arrow-up-alt"></i>
             </label>
             {% endif  %}
         </span>
diff --git a/adhocracy4/polls/static/PollDashboard/EditPollOpenQuestion.jsx b/adhocracy4/polls/static/PollDashboard/EditPollOpenQuestion.jsx
@@ -73,7 +73,7 @@ export const EditPollOpenQuestion = (props) => {
           type="button"
         >
           <i
-            className="fas fa-trash-can"
+            className="fa-solid fa-trash-can"
             aria-label={django.gettext('Delete')}
           />
         </button>
diff --git a/adhocracy4/polls/static/PollDashboard/EditPollQuestion.jsx b/adhocracy4/polls/static/PollDashboard/EditPollQuestion.jsx
@@ -155,7 +155,7 @@ export const EditPollQuestion = (props) => {
           type="button"
         >
           <i
-            className="fas fa-trash-can"
+            className="fa-solid fa-trash-can"
             aria-label={django.gettext('Delete')}
           />
         </button>
diff --git a/adhocracy4/polls/static/PollDetail/PollResults.jsx b/adhocracy4/polls/static/PollDetail/PollResults.jsx
@@ -104,7 +104,7 @@ export default class PollResult extends React.Component {
             const highlight = choice.count === max && max > 0
             return !this.state.question.is_open &&
               <div key={choice.id} className="poll-row__container">
-                {chosen ? <i className="poll-row__chosen fas fa-circle-check" aria-label={django.gettext('Your choice')} /> : ''}
+                {chosen ? <i className="poll-row__chosen fa-solid fa-circle-check" aria-label={django.gettext('Your choice')} /> : ''}
                 <div className="poll-row poll-row--answered">
                   <div className="poll-row__number">{percent}%</div>
                   <div className="poll-row__label">{choice.is_other_choice ? django.gettext('other') : choice.label}</div>
@@ -129,7 +129,7 @@ export default class PollResult extends React.Component {
                               key={index}
                             >
                               <div className="poll-slider__answer">
-                                {this.isUserAnswer(slide) && <i className="fas fa-circle-check" />} {slide.answer}
+                                {this.isUserAnswer(slide) && <i className="fa-solid fa-circle-check" />} {slide.answer}
                               </div>
                               <div className={this.props.question.other_choice_answers.length > 1 ? 'poll-slider__count--spaced' : 'poll-slider__count'}>
                                 {index + 1}/{this.props.question.other_choice_answers.length}
@@ -152,7 +152,7 @@ export default class PollResult extends React.Component {
                     key={index}
                   >
                     <div className="poll-slider__answer">
-                      {this.isUserAnswer(slide) && <i className="fas fa-circle-check" />} {slide.answer}
+                      {this.isUserAnswer(slide) && <i className="fa-solid fa-circle-check" />} {slide.answer}
                     </div>
                     <div className={this.props.question.answers.length > 1 ? 'poll-slider__count--spaced' : 'poll-slider__count'}>
                       {index + 1}/{this.props.question.answers.length}

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ const CommentManageDropdown = (props) => {`
`16`	`16`	`aria-expanded="false"`
`17`	`17`	`data-bs-toggle="dropdown"`
`18`	`18`	`>`
`19`		`- <i className="fas fa-ellipsis" aria-hidden="true" />`
	`19`	`+ <i className="fa-solid fa-ellipsis" aria-hidden="true" />`
`20`	`20`	`</button>`
`21`	`21`	`<div className="dropdown-menu dropdown-menu-end">`
`22`	`22`	`{props.has_changing_permission && [`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ export const FilterSearch = ({`
`41`	`41`	`>`
`42`	`42`	`<span className="fa-stack fa-2x">`
`43`	`43`	`<i className="far fa-circle fa-stack-2x" />`
`44`		`- <i className="fas fa-xmark fa-stack-1x" aria-label={translated.clearSearch} />`
	`44`	`+ <i className="fa-solid fa-xmark fa-stack-1x" aria-label={translated.clearSearch} />`
`45`	`45`	`</span>`
`46`	`46`	`</button>`
`47`	`47`
`@@ -50,7 +50,7 @@ export const FilterSearch = ({`
`50`	`50`	`type="button"`
`51`	`51`	`onClick={() => onSearch(query)}`
`52`	`52`	`>`
`53`		`- <i className="fas fa-magnifying-glass" aria-label={translated.searchContrib} />`
	`53`	`+ <i className="fa-solid fa-magnifying-glass" aria-label={translated.searchContrib} />`
`54`	`54`	`</button>`
`55`	`55`	`</div>`
`56`	`56`	`)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export const FilterSort = ({`
`19`	`19`	`>`
`20`	`20`	`<span className={sort === 'new' ? 'a4-comments__filters__btn-text' : 'd-none'}>{translated.sortedBy}{sorts[sort]}</span>`
`21`	`21`	`<span className={sort !== 'new' ? 'a4-comments__filters__btn-text small-screen' : 'd-none'}>{sorts[sort]}</span>`
`22`		`- <i className={sort === 'new' ? 'fa fa-caret-down' : 'fas fa-check'} aria-hidden="true" />`
	`22`	`+ <i className={sort === 'new' ? 'fa fa-caret-down' : 'fa-solid fa-check'} aria-hidden="true" />`
`23`	`23`	`</button>`
`24`	`24`	`<div className="dropdown-menu dropdown-menu-end" aria-labelledby="sortDropdownBtn">`
`25`	`25`	`{Object.keys(sorts).map(objectKey => {`