diff --git a/src/css/default.scss b/src/css/default.scss index 1ad6ec11559fbe595032ddafd5479c246cdef021..782d25bd12f213d6ca42533d3719d4ae4484dfa1 100644 --- a/src/css/default.scss +++ b/src/css/default.scss @@ -388,14 +388,13 @@ HEADER CONTENT ************************************************************ */ #layout { - position: relative; right: 0; padding-right: 0; } #content { padding-top: 2em; - padding-bottom: 4rem; + padding-bottom: 2rem; } .message-box { @@ -451,15 +450,15 @@ FOOTER ************************************************************ */ #layout { min-height: 100%; - height: 100%; - margin: 0 auto -6rem; /*negative margin = footer height + padding-top + padding-bottom*/ + margin: 0 auto -6rem auto; /*negative margin = footer height + padding-top + padding-bottom*/ } #bottom, #push { - height: 4rem; + height: 6rem; } #footer { + width: 100%; background: linear-gradient(141deg, $primaryBackground 0%, $transitionBackground 51%, $secondaryBackground 75%); height: 4rem; padding: 2rem 0 0; diff --git a/src/js/bundle.js b/src/js/bundle.js index 2710a3368a40214ebeb98d2576ac20ed2bfbbf17..50aeece058ec5f8aa413e9e2729bfae76f96e235 100644 --- a/src/js/bundle.js +++ b/src/js/bundle.js @@ -21,6 +21,7 @@ $(document).ready(function () { $('#menuLink').click(function (e) { e.preventDefault(); $('#layout').toggleClass('active'); + $('#foot').toggleClass('active'); $(this).toggleClass('active'); }); }); \ No newline at end of file diff --git a/templates/base.twig b/templates/base.twig index e7dc81172b902ba0cd192e04aaa5712c5805a57e..29228797c37b932ecba2ae862f9a17ad32818f41 100644 --- a/templates/base.twig +++ b/templates/base.twig @@ -38,11 +38,11 @@ </div> </div><!-- content --> <div id="push"></div> - <div id="foot"> - {%- block footer %}{% include "_footer.twig" %}{% endblock %} - - </div> </div><!-- layout --> + <div id="foot"> + {%- block footer %}{% include "_footer.twig" %}{% endblock %} + + </div> <script src="{{ asset('js/bundle.js') }}"></script> {%- block postload %}{% endblock %}