Merge branch 'frontend_fix_fa_footer' into 'dev'

Fix Font Awesome icons and footer

See merge request federez/re2o!315

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>

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>

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>

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;
 }
 
@@ -64,10 +64,9 @@ a > i.fa {
     }
 }
 
-/* Set height of the grid so .sidenav can be 100% (adjust as needed) */
+/* Set height of the grid so footer stay on footer */
 .row.content {
-    height: 100%;
+    min-height: 70vh;
-    overflow: auto;
 }
 
 /* Set gray background color */
@@ -111,6 +110,7 @@ a > i.fa {
     .modal-dialog {
         width: 1000px
     }
+}
 
 /* For tables with long text in cells */
 

templates/base.html

@@ -223,7 +223,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                             </a>
                         </div>
                         {% else %}
-                            <p>{% trans "You are not logged in." %}</p>
+                            <div class="panel-body">
+                                <p>{% trans "You are not logged in." %}</p>
+                            </div>
                         {% endif %}
                     </div>
                     {% if request_user.is_authenticated %}

templates/registration/login.html

@@ -32,8 +32,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <form method="post" action="{% url 'login' %}">
         {% csrf_token %}
         {% bootstrap_form form %}
-        <button class="btn btn-success" type="submit"><span
+        <button class="btn btn-success" type="submit">
-                class="glyphicon glyphicon-log-in"></span> {% trans "Log in" %}</button>
+            <i class="fa fa-sign-in"></i> {% trans "Log in" %}
+        </button>
     </form>
     <p><a class="btn btn-warning btn-sm" role="button"
           href="{% url 'users:reset-password' %}"> {% trans "Forgotten password?" %}</a></p>