Merge be7255d into cbbdb67

liqd · Apr 17, 2019 · 3297b02 · 3297b02
2 parents cbbdb67 + be7255d
commit 3297b02
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 81 deletions.
diff --git a/liqd_product/apps/account/templates/liqd_product_account/account_dashboard.html b/liqd_product/apps/account/templates/liqd_product_account/account_dashboard.html
@@ -19,21 +19,21 @@
                     <li class="dashboard-nav__page">
                         <a href="{% url 'account_profile' %}"
                            class="dashboard-nav__item dashboard-nav__item--interactive {% if request.resolver_match.url_name == "account_profile" %}is-active{% endif %}">
-                            <i class="fa fa-user" aria-hidden="true"></i>
+                            <i class="far fa-user" aria-hidden="true"></i>
                             {% trans 'Profile' %}
                         </a>
                     </li>
                     <li class="dashboard-nav__page">
                         <a href="{% url 'account_change_password' %}"
                            class="dashboard-nav__item dashboard-nav__item--interactive {% if request.resolver_match.url_name == "account_change_password" %}is-active{% endif %}">
-                            <i class="fa fa-lock" aria-hidden="true"></i>
+                            <i class="fas fa-lock" aria-hidden="true"></i>
                             {% trans 'Change password' %}
                         </a>
                     </li>
                     <li class="dashboard-nav__page">
                         <a href="{% url 'account_email' %}"
                            class="dashboard-nav__item dashboard-nav__item--interactive {% if request.resolver_match.url_name == "account_email" %}is-active{% endif %}">
-                            <i class="fa fa-envelope" aria-hidden="true"></i>
+                            <i class="far fa-envelope" aria-hidden="true"></i>
                             {% trans 'Email addresses' %}
                         </a>
                     </li>

diff --git a/liqd_product/apps/contrib/templates/liqd_product_contrib/component_library.html b/liqd_product/apps/contrib/templates/liqd_product_contrib/component_library.html
@@ -433,7 +433,7 @@ <h2 id="cl-category_formset">Category Formset</h2>
                             <input name="category_set-0-DELETE" id="id_category_set-0-DELETE" class="category-formset__delete" type="checkbox">
                             <input name="category_set-0-name" value="category 1" placeholder="Kategorie" id="id_category_set-0-name" type="text">
                             <label for="id_category_set-0-DELETE" class="category-formset__delete-label" title="Kategorie entfernen">
-                                <i class="fas fa-trash-alt" aria-label="Kategorie entfernen"></i>
+                                <i class="far fa-trash-alt" aria-label="Kategorie entfernen"></i>
                             </label>
                         </div>
 
@@ -481,7 +481,7 @@ <h2 id="cl-commenting">Commenting</h2>
                                     <i class="fa fa-chevron-down" aria-label="Move down"></i>
                                 </button>
                                 <button class="btn btn--light btn--small" title="Delete" type="button">
-                                    <i class="fas fa-trash-alt" aria-label="Delete"></i>
+                                    <i class="far fa-trash-alt" aria-label="Delete"></i>
                                 </button>
                             </div>
                         {% endspaceless %}
@@ -492,7 +492,7 @@ <h2 id="cl-commenting">Commenting</h2>
                         </div>
                         <div class="commenting__actions">
                             <button class="btn btn--light btn--small" title="Delete" type="button">
-                                <i class="fas fa-trash-alt" aria-label="Delete"></i>
+                                <i class="far fa-trash-alt" aria-label="Delete"></i>
                             </button>
                         </div>
                     </div>
@@ -502,7 +502,7 @@ <h2 id="cl-commenting">Commenting</h2>
                         </button>
                         <div class="commenting__actions">
                             <button class="btn btn--light btn--small" title="Delete" type="button">
-                                <i class="fas fa-trash-alt" aria-label="Delete"></i>
+                                <i class="far fa-trash-alt" aria-label="Delete"></i>
                             </button>
                         </div>
                     </div>
@@ -512,7 +512,7 @@ <h2 id="cl-commenting">Commenting</h2>
                         </button>
                         <div class="commenting__actions">
                             <button class="btn btn--light btn--small" title="Delete" type="button">
-                                <i class="fas fa-trash-alt" aria-label="Delete"></i>
+                                <i class="far fa-trash-alt" aria-label="Delete"></i>
                             </button>
                         </div>
                     </div>

diff --git a/liqd_product/apps/documents/assets/ChapterNavItem.jsx b/liqd_product/apps/documents/assets/ChapterNavItem.jsx
@@ -48,7 +48,7 @@ const ChapterNavItem = (props) => {
           disabled={!props.onDelete}
           title={django.gettext('Delete')}
           type="button">
-          <i className="fa fa-trash"
+          <i className="far fa-trash-alt"
             aria-label={django.gettext('Delete')} />
         </button>
       </div>

diff --git a/liqd_product/apps/documents/assets/ParagraphForm.jsx b/liqd_product/apps/documents/assets/ParagraphForm.jsx
@@ -121,7 +121,7 @@ class Paragraph extends React.Component {
               onClick={this.props.onDelete}
               title={django.gettext('Delete')}
               type="button">
-              <i className="fa fa-trash"
+              <i className="far fa-trash-alt"
                 aria-label={django.gettext('Delete')} />
             </button>
           </div>

diff --git a/liqd_product/apps/polls/assets/QuestionForm.jsx b/liqd_product/apps/polls/assets/QuestionForm.jsx
@@ -89,7 +89,7 @@ const QuestionForm = (props) => {
           onClick={props.onDelete}
           title={django.gettext('Delete')}
           type="button">
-          <i className="fa fa-trash"
+          <i className="far fa-trash-alt"
             aria-label={django.gettext('Delete')} />
         </button>
       </div>

diff --git a/liqd_product/assets/scss/_line_awesome_overwrites.scss b/liqd_product/assets/scss/_line_awesome_overwrites.scss
diff --git a/liqd_product/assets/scss/components/_input_group.scss b/liqd_product/assets/scss/components/_input_group.scss
@@ -37,6 +37,10 @@
     }
 }
 
+.input-group__after.input-group__after-outside {
+    margin-bottom: 4px;
+}
+
 .input-group__input:focus,
 .input-group__before:focus,
 .input-group__after:focus {

diff --git a/liqd_product/assets/scss/components/_radio.scss b/liqd_product/assets/scss/components/_radio.scss
@@ -35,7 +35,6 @@ $checkbox-size: 20px;
         transform: scale(1.3);
         opacity: 0;
 
-        padding-top: 2px;
         font-family: "Font Awesome 5 Free", sans-serif;
         font-weight: 900;
         background-color: $brand-primary;

diff --git a/liqd_product/assets/scss/style.scss b/liqd_product/assets/scss/style.scss
@@ -79,4 +79,3 @@
 @import 'utility';
 
 @import 'shame';
-@import 'line_awesome_overwrites';
diff --git a/liqd_product/templates/a4dashboard/includes/project_list_item.html b/liqd_product/templates/a4dashboard/includes/project_list_item.html
@@ -65,7 +65,7 @@ <h2 class="list-item__title">
                                 </button>
                             </form>
                             <a href="#" class="dropdown-item u-fontweight-normal" data-toggle="modal" data-target="#project{{ project.pk }}DeleteModal">
-                                <i class="fa fa-trash" aria-hidden="true"></i>
+                                <i class="far fa-trash-alt" aria-hidden="true"></i>
                                 {% trans 'delete' %}
                             </a>
                         </div>

diff --git a/liqd_product/templates/a4forms/includes/inline_form.html b/liqd_product/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="{% trans 'Remove category' %}">
-                <i class="fa fa-trash" aria-label="{% trans 'Remove category' %}"></i>
+                <i class="far fa-trash-alt" aria-label="{% trans 'Remove category' %}"></i>
             </label>
         {% endif %}
         {% for hidden in form.hidden_fields %}

diff --git a/liqd_product/templates/a4images/image_upload_widget.html b/liqd_product/templates/a4images/image_upload_widget.html
@@ -7,13 +7,13 @@
             <label for="{{ checkbox_id }}"
                 class="upload-wrapper__action input-group__after btn btn--danger"
                 title="{% trans 'Remove the picture' %}">
-                <i class="fa fa-trash" aria-label="{% trans 'Remove the picture' %}"></i>
+                <i class="far fa-trash-alt" aria-label="{% trans 'Remove the picture' %}"></i>
             </label>
         {% else %}
             <label for="{{ id }}"
                 class="upload-wrapper__action input-group__after btn"
                 title="{% trans 'Upload a picture' %}">
-                <i class="fa fa-cloud-upload" aria-label="{% trans 'Upload a picture' %}"></i>
+                <i class="fas fa-cloud-upload-alt" aria-label="{% trans 'Upload a picture' %}"></i>
             </label>
         {% endif %}
     </div>

diff --git a/package.json b/package.json
@@ -34,7 +34,6 @@
     "leaflet": "1.4.0",
     "leaflet-draw": "1.0.4",
     "leaflet.markercluster": "1.4.1",
-    "line-awesome": "1.0.2",
     "mapbox-gl": "0.53.1",
     "mapbox-gl-leaflet": "0.0.4",
     "mini-css-extract-plugin": "0.6.0",

diff --git a/webpack.common.js b/webpack.common.js
@@ -14,8 +14,11 @@ module.exports = {
     ],
     vendor: [
       'classnames',
+      '@fortawesome/fontawesome-free/scss/fontawesome.scss',
+      '@fortawesome/fontawesome-free/scss/brands.scss',
+      '@fortawesome/fontawesome-free/scss/regular.scss',
+      '@fortawesome/fontawesome-free/scss/solid.scss',
       'js-cookie',
-      'line-awesome/css/line-awesome.min.css',
       'react',
       'immutability-helper',
       'react-dom',