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: rename fontawesome icons to v6 #1394

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

WIP: rename fontawesome icons to v6 #1394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e405d6
rename fontawesome icons for v6
goapunk Apr 20, 2023
3c4cb0f
fontawesome fa -> fa-solid
goapunk Apr 20, 2023
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
2 changes: 1 addition & 1 deletion adhocracy4/categories/templates/a4categories/includes/module_categories_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<div class="category-formset__btn">
<button class="btn btn--secondary btn--small btn--full js-add-form" type="button">
<i class="fa fa-plus" aria-hidden="true"></i>
<i class="fa-solid fa-plus" aria-hidden="true"></i>
{% translate 'Add category' %}
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions adhocracy4/comments/static/comments/Comment.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ class Comment extends React.Component {
type="button"
onClick={this.replyComments.bind(this)}
>
<i className="fa fa-reply" aria-hidden="true" /> {answerTag}
<i className="fa-solid fa-reply" aria-hidden="true" /> {answerTag}
</button>}
{this.context.isAuthenticated && !this.props.is_deleted &&
<CommentManageDropdown
Expand All @@ -215,7 +215,7 @@ class Comment extends React.Component {
<div className="action-bar">
<div className="navbar">
<button className="comment-reply-button" type="button" onClick={this.toggleShowComments.bind(this)}>
<i className={this.state.showChildComments ? 'fa fa-minus' : 'fa fa-plus'} aria-hidden="true" />
<i className={this.state.showChildComments ? 'fa-solid fa-minus' : 'fa-solid fa-plus'} aria-hidden="true" />
{getViewRepliesText(this.props.child_comments.length, this.state.showChildComments)}
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion adhocracy4/comments/static/comments/CommentManageDropdown.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const CommentManageDropdown = (props) => {
type="button" className="dropdown-toggle" aria-haspopup="true"
aria-expanded="false" data-bs-toggle="dropdown"
>
<i className="fa fa-ellipsis-h" aria-hidden="true" />
<i className="fa-solid fa-ellipsis" aria-hidden="true" />
</button>
<ul className="dropdown-menu">
{props.renderModeratorOptions && [
Expand Down
8 changes: 4 additions & 4 deletions adhocracy4/comments_async/static/comments_async/comment.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -425,22 +425,22 @@ export default class Comment extends React.Component {
{((this.allowForm() && !this.props.is_deleted) || (this.props.child_comments && this.props.child_comments.length > 0)) &&
<button className="btn btn--no-border a4-comments__action-bar__btn" type="button" onClick={this.toggleShowComments.bind(this)}>
<a href="#child-comment-form">
<i className={this.state.showChildComments ? 'fa fa-minus' : 'far fa-comment'} aria-hidden="true" /> {getAnswerForm(this.state.showChildComments, this.props.child_comments.length)}
<i className={this.state.showChildComments ? 'fa-solid fa-minus' : 'fa-regular fa-comment'} aria-hidden="true" /> {getAnswerForm(this.state.showChildComments, this.props.child_comments.length)}
</a>
</button>}

{!this.props.is_deleted &&
<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-exclamation-triangle" />{translated.report}
><i className="fa-solid fa-triangle-exclamation" />{translated.report}
</a>}

</div>
Expand Down
8 changes: 4 additions & 4 deletions adhocracy4/comments_async/static/comments_async/comment_box.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ export const CommentBox = (props) => {
onClick={handleToggleFilters}
>
<i
className="fas fa-sliders-h ms-2"
className="fa-solid fa-sliders ms-2"
aria-label={translated.showFilters}
/>
{translated.filters}
Expand All @@ -492,7 +492,7 @@ export const CommentBox = (props) => {
onClick={handleToggleFilters}
>
<i
className="fas fa-times ms-2"
className="fa-solid fa-xmark ms-2"
aria-label={translated.hideFilters}
/>
{translated.hideFilters}
Expand Down Expand Up @@ -530,7 +530,7 @@ export const CommentBox = (props) => {
)}

<div className={loadingFilter ? 'u-spinner__container' : 'd-none'}>
<i className="fa fa-spinner fa-pulse" aria-hidden="true" />
<i className="fa-solid fa-spinner fa-pulse" aria-hidden="true" />
<span className="visually-hidden">Loading...</span>
</div>
</div>
Expand Down Expand Up @@ -559,7 +559,7 @@ export const CommentBox = (props) => {
</div>
</div>
<div className={loading ? 'u-spinner__container' : 'd-none'}>
<i className="fa fa-spinner fa-pulse" aria-hidden="true" />
<i className="fa-solid fa-spinner fa-pulse" aria-hidden="true" />
<span className="visually-hidden">Loading...</span>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion adhocracy4/comments_async/static/comments_async/comment_manage_dropdown.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const CommentManageDropdown = (props) => {
aria-expanded="false"
data-bs-toggle="dropdown"
>
<i className="fas fa-ellipsis-h" aria-hidden="true" />
<i className="fa-solid fa-ellipsis" aria-hidden="true" />
</button>
<div className="dropdown-menu dropdown-menu-end">
{props.has_changing_permission && [
Expand Down
2 changes: 1 addition & 1 deletion adhocracy4/comments_async/static/comments_async/filter_category.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-solid fa-caret-down' : 'fa-solid fa-check'} aria-hidden="true" />
</button>
<div className="dropdown-menu dropend" aria-labelledby="categoryDropdownBtn">
{filter !== 'all' &&
Expand Down
6 changes: 3 additions & 3 deletions adhocracy4/comments_async/static/comments_async/filter_search.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ export const FilterSearch = ({
onClick={handleClearQuery}
>
<span className="fa-stack fa-2x">
<i className="far fa-circle fa-stack-2x" />
<i className="fas fa-times fa-stack-1x" aria-label={translated.clearSearch} />
<i className="fa-regular fa-circle fa-stack-2x" />
<i className="fa-solid fa-xmark fa-stack-1x" aria-label={translated.clearSearch} />
</span>
</button>

Expand All @@ -50,7 +50,7 @@ export const FilterSearch = ({
type="button"
onClick={() => onSearch(query)}
>
<i className="fas fa-search" aria-label={translated.searchContrib} />
<i className="fa-solid fa-magnifying-glass" aria-label={translated.searchContrib} />
</button>
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion adhocracy4/comments_async/static/comments_async/filter_sort.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-solid 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 => {
Expand Down
2 changes: 1 addition & 1 deletion adhocracy4/comments_async/static/comments_async/moderator_feedback.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions adhocracy4/dashboard/templates/a4dashboard/base_dashboard_project.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
class="{{ item.is_active|yesno:"is-active," }}">
{{ item.label }}
{% if not item.is_complete %}
<i class="fa fa-exclamation-circle u-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
<i class="fa-solid fa-circle-exclamation u-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
{% endif %}
</a>
</li>
Expand All @@ -30,7 +30,7 @@
class="{{ item.is_active|yesno:"is-active," }}">
{{ item.label }}
{% if not item.is_complete %}
<i class="fa fa-exclamation-circle u-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
<i class="fa-solid fa-circle-exclamation u-danger" title="{% translate 'Missing fields for publication' %}" aria-label="{% translate 'Missing fields for publication' %}"></i>
{% endif %}
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion adhocracy4/dashboard/templates/a4dashboard/includes/form_field.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

{% block after_label %}
{% if field.field.required_for_publish and not field.value %}
<i class="fa fa-exclamation-circle u-danger" title="{% translate 'Missing field for publication' %}" aria-label="{% translate 'Missing field for publication' %}"></i>
<i class="fa-solid fa-circle-exclamation u-danger" title="{% translate 'Missing field for publication' %}" aria-label="{% translate 'Missing field for publication' %}"></i>
{% endif %}
{% endblock %}
2 changes: 1 addition & 1 deletion adhocracy4/dashboard/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
6 changes: 3 additions & 3 deletions adhocracy4/dashboard/templates/a4dashboard/project_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h2>

<a href="{{ project.get_absolute_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 @@ -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-alt" aria-hidden="true"></i>
<i class="fa-solid fa-pencil" aria-hidden="true"></i>
{% translate 'Edit' %}
</a>

Expand All @@ -53,7 +53,7 @@ <h2>
<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>
Expand Down
2 changes: 1 addition & 1 deletion adhocracy4/filters/templates/a4filters/widgets/dropdown_link.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
id="{{ id }}"
>
<div class="value-label">{{ value_label }}</div>
<i class="fa fa-caret-down drop-down-caret" aria-hidden="true"></i>
<i class="fa-solid fa-caret-down drop-down-caret" aria-hidden="true"></i>
</button>
{{ options }}
</div>
2 changes: 1 addition & 1 deletion adhocracy4/filters/templates/a4filters/widgets/free_text_filter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
{% endif %}
{% endfor %}
<input class="search-filter-input" id="{{ id }}" type="search" name="{{ name }}" value="{{ value }}">
<button class="search-filter-btn btn" type="submit" title="{% translate 'Search' %}"><i class="fa fa-search" aria-label="{% translate 'Search' %}"></i></button>
<button class="search-filter-btn btn" type="submit" title="{% translate 'Search' %}"><i class="fa-solid fa-magnifying-glass" aria-label="{% translate 'Search' %}"></i></button>
</form>
</div>
2 changes: 1 addition & 1 deletion adhocracy4/follows/static/follows/FollowButton.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class FollowButton extends React.Component {
return (
<span className="follow">
<button className={this.state.followed ? 'btn btn--following' : 'btn btn--follow'} type="button" onClick={this.toggleFollow.bind(this)}>
<i className={this.state.followed ? 'fa fa-check' : 'fa fa-plus'} aria-hidden="true" />&nbsp;<span className="follow__btn--content">{this.state.followed ? followingTag : followTag}</span>
<i className={this.state.followed ? 'fa-solid fa-check' : 'fa-solid fa-plus'} aria-hidden="true" />&nbsp;<span className="follow__btn--content">{this.state.followed ? followingTag : followTag}</span>
</button>
<span className="follow__notification">
<Alert onClick={this.removeAlert.bind(this)} {...this.state.alert} />
Expand Down
4 changes: 2 additions & 2 deletions adhocracy4/forms/templates/a4forms/includes/inline_form.html
View file
Open in desktop
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 category' %}">
<i class="fa fa-times" aria-label="{% translate 'Remove category' %}"></i>
<i class="fa-solid fa-xmark" aria-label="{% translate 'Remove category' %}"></i>
</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-alt" 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 %}
Expand Down
4 changes: 2 additions & 2 deletions adhocracy4/images/templates/a4images/image_upload_widget.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-alt"></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-upload-alt"></i>
<i class="fa-solid fa-cloud-arrow-up"></i>
</label>
{% endif %}
</span>
Expand Down
2 changes: 1 addition & 1 deletion adhocracy4/labels/templates/a4labels/includes/module_labels_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<div class="category-formset__btn">
<button class="btn btn--secondary btn--small btn--full js-add-form" type="button">
<i class="fa fa-plus" aria-hidden="true"></i>
<i class="fa-solid fa-plus" aria-hidden="true"></i>
{% translate 'Add label' %}
</button>
</div>
Expand Down
6 changes: 3 additions & 3 deletions adhocracy4/maps/static/a4maps/a4maps_choose_polygon_with_preset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ function init () {
const importLabel = django.gettext('Import polygon via file upload')
return $.parseHTML(
'<div class="leaflet-bar leaflet-control leaflet-control-custom">' +
'<a href="#" id="map-export-link" title="' + exportLabel + '"><i class="fa fa-download" aria-label="' + exportLabel + '"></i></a>' +
'<a href="#map-import-modal" data-bs-toggle="modal" data-bs-target="#map-import-modal" title="' + importLabel + '"><i class="fa fa-upload" aria-label="' + importLabel + '"></i></a>' +
'<a href="#" id="map-export-link" title="' + exportLabel + '"><i class="fa-solid fa-download" aria-label="' + exportLabel + '"></i></a>' +
'<a href="#map-import-modal" data-bs-toggle="modal" data-bs-target="#map-import-modal" title="' + importLabel + '"><i class="fa-solid fa-upload" aria-label="' + importLabel + '"></i></a>' +
'</div>'
)[0]
},
Expand All @@ -85,7 +85,7 @@ function init () {
'<div class="modal-content">' +
'<div class="modal-header">' +
'<h2 class="modal-title u-first-heading">' + modalTitle + '</h2>' +
'<button class="close" aria-label="' + django.gettext('Close') + '" data-bs-dismiss="modal"><i class="fa fa-times"></i></button>' +
'<button class="close" aria-label="' + django.gettext('Close') + '" data-bs-dismiss="modal"><i class="fa-solid fa-xmark"></i></button>' +
'</div>' +
'<div class="modal-body">' +
'<form id="map-import-form" data-ignore-submit="true">' +
Expand Down
8 changes: 4 additions & 4 deletions adhocracy4/maps/static/a4maps/a4maps_display_points.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,16 @@ function init () {

function getRatings (feature) {
return '<span class="map-popup-upvotes">' +
feature.properties.positive_rating_count + ' <i class="fa fa-chevron-up" aria-hidden="true"></i>' +
feature.properties.positive_rating_count + ' <i class="fa-solid fa-chevron-up" aria-hidden="true"></i>' +
'</span>' +
'<span class="map-popup-downvotes">' +
feature.properties.negative_rating_count + ' <i class="fa fa-chevron-down" aria-hidden="true"></i>' +
feature.properties.negative_rating_count + ' <i class="fa-solid fa-chevron-down" aria-hidden="true"></i>' +
'</span>'
}

function getSupport (feature) {
return '<span class="map-popup-upvotes">' +
feature.properties.positive_rating_count + ' <i class="fa fa-thumbs-up" aria-hidden="true"></i>' +
feature.properties.positive_rating_count + ' <i class="fa-solid fa-thumbs-up" aria-hidden="true"></i>' +
'<span class="visually-hidden">' +
django.ngettext(
'person supports this proposal.',
Expand All @@ -121,7 +121,7 @@ function init () {

function getCommentCount (feature) {
return '<span class="map-popup-comments-count">' +
feature.properties.comments_count + ' <i class="far fa-comment" aria-hidden="true"></i>' +
feature.properties.comments_count + ' <i class="fa-regular fa-comment" aria-hidden="true"></i>' +
'<span class="visually-hidden">' +
django.ngettext(
'person commented on this proposal.',
Expand Down
2 changes: 1 addition & 1 deletion adhocracy4/polls/static/PollDashboard/EditPollChoice.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const EditPollChoice = (props) => {
disabled={props.undeletable}
>
<i
className="fa fa-times"
className="fa-solid fa-xmark"
aria-label={django.gettext('remove')}
/>
</button>
Expand Down
2 changes: 1 addition & 1 deletion adhocracy4/polls/static/PollDashboard/EditPollDropdown.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const EditPollDropdown = (props) => {
aria-expanded="false"
data-bs-toggle="dropdown"
>
<i className="fa fa-plus" />
<i className="fa-solid fa-plus" />
{translated.new}
</button>
<div className="dropdown-menu">
Expand Down
Loading