Merge pull request bepasty#335 from ThomasWaldmann/fontawesome-upgrade

Fontawesome upgrade v4 -> v6

Author: ThomasWaldmann

pyproject.toml

@@ -37,7 +37,7 @@ dependencies = [
     "XStatic-asciinema-player <= 2.6.1.1",
     "xstatic-bootbox >= 5.4.0, <= 5.5.1.1",
     "xstatic-bootstrap >=4.0.0.0, <= 4.5.3.1",
-    "xstatic-font-awesome <= 4.7.0.0",
+    "xstatic-font-awesome >= 6.0.0, <= 6.2.1.1",
     "xstatic-jquery <= 3.5.1.1",
     "xstatic-jquery-ui <= 1.13.0.1",
     "xstatic-jquery-file-upload <= 10.31.0.1",

src/bepasty/templates/_layout.html

@@ -14,8 +14,10 @@
         <link rel="stylesheet" href="{{ url_for('bepasty.xstatic', name='bootstrap', filename='css/bootstrap.min.css') }}" type="text/css">
         <!-- jQuery UI styles -->
         <link rel="stylesheet" href="{{ url_for('bepasty.xstatic', name='jquery_ui', filename='themes/smoothness/jquery-ui.css') }}" type="text/css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="{{ url_for('bepasty.xstatic', name='font_awesome', filename='css/font-awesome.min.css') }}">
+        <!-- Font Awesome - load only what we need -->
+        <link rel="stylesheet" href="{{ url_for('bepasty.xstatic', name='font_awesome', filename='css/fontawesome.min.css') }}">
+        <link rel="stylesheet" href="{{ url_for('bepasty.xstatic', name='font_awesome', filename='css/solid.min.css') }}">
+        <link rel="stylesheet" href="{{ url_for('bepasty.xstatic', name='font_awesome', filename='css/regular.min.css') }}">
         <!-- Bepasty styles -->
         <link rel="stylesheet" href="{{ url_for('static', filename='app/css/style.css' ) }}" type="text/css">
         {% block extra_link %}{% endblock %}
@@ -31,7 +33,7 @@
                         <a class="navbar-brand" href="{{ url_for('bepasty.index') }}">
                             {{ config.SITENAME }}
                             <span class="navbar-text small">
-                                (Permissions:{% for permission, permission_icon in flaskg.icon_permissions %} <i class="fa fa-{{ permission_icon }}" title="{{ permission }}"></i>{% endfor %})
+                                (Permissions:{% for permission, permission_icon in flaskg.icon_permissions %} <i class="fas fa-{{ permission_icon }}" title="{{ permission }}"></i>{% endfor %})
                             </span>
                         </a>
                         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarHeader" aria-controls="navbarHeader" aria-expanded="false" aria-label="Toggle navigation">

src/bepasty/templates/display.html

@@ -12,17 +12,17 @@ <h1>
             {% if not item.meta['locked'] or may(ADMIN) %}
                 {% if is_list_item %}
                 <a id="carousel-btn" href="{{ url_for('bepasty.carousel', name=name) }}" class="btn btn-info">
-                    <span class="fa fa-play-circle"></span> Carousel
+                    <span class="fas fa-play-circle"></span> Carousel
                 </a>
                 {% endif %}
                 <a id="qr-btn" href="{{ url_for('bepasty.qr', name=name) }}" class="btn btn-info">
-                    <span class="fa fa-qrcode"></span> QR
+                    <span class="fas fa-qrcode"></span> QR
                 </a>
                 <a id="download-btn" href="{{ url_for('bepasty.download', name=name) }}" class="btn btn-info" role="button">
-                    <span class="fa fa-download"></span> Download
+                    <span class="fas fa-download"></span> Download
                 </a>
                 <a id="inline-btn" href="{{ url_for('bepasty.inline', name=name) }}" class="btn btn-info" role="button">
-                    <span class="fa fa-asterisk"></span> Inline
+                    <span class="fas fa-asterisk"></span> Inline
                 </a>
             {% endif %}
             {% if may(MODIFY) %}
@@ -45,28 +45,28 @@ <h1>
                     </form>
                 </div>
                 <button id="modify-btn" type="button" class="btn btn-info">
-                    <span class="fa fa-edit"></span> Modify
+                    <span class="fas fa-edit"></span> Modify
                 </button>
             {% endif %}
             {% if may(DELETE) %}
                 <form id="del-frm" action="{{ url_for('bepasty.delete', name=name) }}" method="post" class="btn-group">
                     <input type="hidden" name="next" value="{{ url_for('bepasty.index') }}">
                     <button id="del-btn" type="button" class="btn btn-danger">
-                        <span class="fa fa-remove"></span> Delete
+                        <span class="fas fa-times"></span> Delete
                     </button>
                 </form>
             {% endif %}
             {% if may(ADMIN) %}
             {% if not item.meta['locked'] %}
                 <form id="lock-frm" action="{{ url_for('bepasty.lock', name=name) }}" method="post" class="btn-group">
                     <button id="lock-btn" type="submit" class="btn btn-danger">
-                        <span class="fa fa-lock"></span> Lock
+                        <span class="fas fa-lock"></span> Lock
                     </button>
                 </form>
             {% else %}
                 <form id="unlock-frm" action="{{ url_for('bepasty.unlock', name=name) }}" method="post" class="btn-group">
                     <button id="unlock-btn" type="submit" class="btn btn-info">
-                        <span class="fa fa-unlock"></span> Unlock
+                        <span class="fas fa-unlock"></span> Unlock
                     </button>
                 </form>
             {% endif %}

src/bepasty/templates/index.html

@@ -44,7 +44,7 @@
             <label>Maximum lifetime value (choose before dragging or submitting)</label>
             {{ maximum_lifetime() }}
             <span class="btn btn-light fileinput-button dropzone">
-                <i class="fa fa-upload"></i>
+                <i class="fas fa-upload"></i>
                 <span>drag and drop files here - or click to select files</span>
                 <!-- Input for file upload widget -->
                 <input id="fileupload" type="file" class="form-control-file" name="file" multiple style="height: 100%; width: 100%;">
@@ -92,23 +92,23 @@ <h1>bepasty, the Binary File Upload Site</h1>
 <div class="jumbotron">
     <div class="row">
         <div class="col-md-3">
-            <span class="fa fa-thumbs-o-up"></span>
+            <span class="far fa-thumbs-up"></span>
             <h2>Free and Nice</h2>
             <p>
                 A pastebin for <em>all</em> the stuff,<br>
                 not just for text.
             </p>
         </div>
         <div class="col-md-6">
-            <span class="fa fa-eye"></span>
+            <span class="fas fa-eye"></span>
             <h2>Free and Open Source</h2>
             <p>
                 bepasty is free and open source software.<br>
                 <a href="https://github.com/bepasty/">bepasty project on github</a>
             </p>
         </div>
         <div class="col-md-3">
-            <span class="fa fa-heart-o"></span>
+            <span class="far fa-heart"></span>
             <h2>Awesome Code</h2>
             <p>
                 Powered by <a href="http://python.org">Python</a> and