Merge pull request #163 from crf-devs/user_footer

Add common user footer
crf-devs · Mar 27, 2020 · f12e908 · f12e908
2 parents 0334921 + a3fc014
commit f12e908
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/assets/css/app.scss b/assets/css/app.scss
@@ -11,6 +11,9 @@ legend.required::before {
 }
 
 footer {
+  margin-top: 100px;
+  padding-top: 50px;
+  padding-bottom: 30px;
   background-color: #f7f7f7;
   box-shadow: inset 0 3px 3px -1px rgba(227, 227, 227, 1);
 }

diff --git a/templates/_footer.html.twig b/templates/_footer.html.twig
@@ -0,0 +1,8 @@
+<footer class="page-footer font-small">
+    <div class="footer-copyright text-center">
+        <p class="font-italic text-secondary">
+            Réserve Opérationnelle - Croix-Rouge Française à Paris -
+            Contribuez au projet: <a href="https://github.com/crf-devs/resop/" target="_blank" class="text-body">github.com/crf-devs/resop</a>
+        </p>
+    </div>
+</footer>
diff --git a/templates/base.html.twig b/templates/base.html.twig
@@ -36,6 +36,9 @@
         <div class="container my-4">
             {% block body %}{% endblock %}
         </div>
+
+        {% include '_footer.html.twig' %}
+
         {% block javascripts %}
             {{ encore_entry_script_tags('app') }}
         {% endblock %}

diff --git a/templates/organization/base.html.twig b/templates/organization/base.html.twig
@@ -40,14 +40,7 @@
             </div>
         {% endblock %}
 
-        <footer class="page-footer font-small pt-4 mt-5">
-            <div class="footer-copyright text-center py-3">
-                <p class="font-italic text-secondary">
-                    Réserve Opérationnelle - Croix-Rouge Française de Paris -
-                    Contribuez au projet: <a href="https://github.com/crf-devs/resop/" target="_blank" class="text-body">github.com/crf-devs/resop</a>
-                </p>
-            </div>
-        </footer>
+        {% include '_footer.html.twig' %}
 
         {% block javascripts %}
             {{ encore_entry_script_tags('app') }}