From 0f7f14c1ea320b1b5c7c0e4a4f2724998ec49e5b Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Thu, 27 Sep 2018 22:23:45 +0200
Subject: [PATCH] Fix Font Awesome icons

Some icons had their id changed in the Debian version (4.7.0) so their
id need to be updated.

Also the width of an icon in a button was reduced to make it more
compact.
---
 cotisations/templates/cotisations/aff_cotisations.html    | 2 +-
 cotisations/templates/cotisations/aff_custom_invoice.html | 2 +-
 machines/templates/machines/aff_machines.html             | 2 +-
 static/css/base.css                                       | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cotisations/templates/cotisations/aff_cotisations.html b/cotisations/templates/cotisations/aff_cotisations.html
index 30de85dc..93384106 100644
--- a/cotisations/templates/cotisations/aff_cotisations.html
+++ b/cotisations/templates/cotisations/aff_cotisations.html
@@ -78,7 +78,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>
                 {% if facture.valid %}
                 <a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:facture-pdf' facture.id %}">
-                    <i class="fa fa-file-pdf"></i> {% trans "PDF" %}
+                    <i class="fa fa-file-pdf-o"></i> {% trans "PDF" %}
                 </a>
                 {% else %}
                 <i class="text-danger">{% trans "Invalidated invoice" %}</i>
diff --git a/cotisations/templates/cotisations/aff_custom_invoice.html b/cotisations/templates/cotisations/aff_custom_invoice.html
index 41984c2c..0f4605ad 100644
--- a/cotisations/templates/cotisations/aff_custom_invoice.html
+++ b/cotisations/templates/cotisations/aff_custom_invoice.html
@@ -76,7 +76,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 {% acl_end %}
                 {% history_button invoice %}
                 <a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:custom-invoice-pdf' invoice.id %}">
-                    <i class="fa fa-file-pdf"></i> {% trans "PDF" %}
+                    <i class="fa fa-file-pdf-o"></i> {% trans "PDF" %}
                 </a>
             </td>
         </tr>
diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html
index e3404036..76ba3451 100644
--- a/machines/templates/machines/aff_machines.html
+++ b/machines/templates/machines/aff_machines.html
@@ -52,7 +52,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                     <td colspan="4">
                         {% trans "No name" as tr_no_name %}
                         {% trans "View the profile" as tr_view_the_profile %}
-                        <b>{{ machine.name|default:'<i>tr_no_name</i>' }}</b> <i class="fa-angle-right"></i>
+                        <b>{{ machine.name|default:'<i>tr_no_name</i>' }}</b> <i class="fa fa-angle-right"></i>
                         <a href="{% url 'users:profil' userid=machine.user.id %}" title=tr_view_the_profile>
                             <i class="fa fa-user"></i> {{ machine.user }}
                         </a>
diff --git a/static/css/base.css b/static/css/base.css
index ec151adb..4f5d77fc 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -12,10 +12,10 @@ footer p {
 .navbar { margin-bottom: 0; }
 .pt4 { padding-top: 1.5rem!important; }
 
-/* Reserv space for icons and align */
+/* Reserve space for icons and align */
 a > i.fa {
     display: inline-block;
-    width: 26px;
+    width: 16px;
     text-align: center;
 }
 
@@ -111,6 +111,7 @@ a > i.fa {
     .modal-dialog {
         width: 1000px
     }
+}
 
 /* For tables with long text in cells */