From 38d35768560c1fd0eecd837304bb306e87ee2b76 Mon Sep 17 00:00:00 2001 From: Pavel Egorov Date: Tue, 2 Jun 2020 13:23:48 +0300 Subject: [PATCH 1/2] Bugfix footer visualisation --- app/views/layouts/shared/_footer.html.slim | 26 ++++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/app/views/layouts/shared/_footer.html.slim b/app/views/layouts/shared/_footer.html.slim index 1e4a59b12..7995b1af9 100644 --- a/app/views/layouts/shared/_footer.html.slim +++ b/app/views/layouts/shared/_footer.html.slim @@ -1,26 +1,28 @@ -footer.text-muted.pb-5.mt-auto - .container.mt-5 - .row - .col-12.col-md-4 - .h4 © Hexlet - hr +footer.bg-light.border-top.mt-auto.py-3 + .container-xl + .d-md-flex.justify-content-around + .flex-column + a.navbar-brand.text-dark.px-0.py-0(href='https://ru.hexlet.io') + h5 © Hexlet ul.list-unstyled - li= link_to t('.about'), page_path('about') - li= link_to t('.source_code'), 'https://github.com/Hexlet/hexlet-cv', target: "_blank" - li= link_to 'Slack #hexlet-volunteers', 'https://slack-ru.hexlet.io/', target: "_blank" + li= link_to t('.about'), page_path('about') + li= link_to t('.source_code'), 'https://github.com/Hexlet/hexlet-cv', target: "_blank" + li= link_to 'Slack #hexlet-volunteers', 'https://slack-ru.hexlet.io/', target: "_blank" / .col-12.col-md-4 / div.h5.mb-3= t('.other_os_projects') / ul.list-unstyled / li= link_to 'NodeJS', 'https://github.com/Hexlet/hexlet-interview', target: "_blank" / li= link_to 'PHP', 'https://github.com/Hexlet/hexlet-sicp', target: "_blank" / li= link_to 'Java', 'https://github.com/Hexlet/hexlet-correction', target: "_blank" - .col-12.col-md-4 - div.h5.mb-3= t('.help') + + .flex-column + h5= t('.help') ul.list-unstyled li= link_to t('.knowledge'), 'https://ru.hexlet.io/knowledge', target: "_blank" li= link_to t('.blog'), 'https://ru.hexlet.io/blog', target: "_blank" li= link_to t('.recommended_books'), 'https://ru.hexlet.io/pages/recommended-books', target: "_blank" - div.h5.mb-3= t('.additionally') + .flex-column + h5= t('.additionally') ul.list-unstyled li= link_to 'Code Basics', 'https://ru.code-basics.com/', target: "_blank" li= link_to 'Code Battles', 'https://codebattle.hexlet.io/' , target: "_blank" From b8e3be4ac907bc379b64a0bf3e608d0aeb056416 Mon Sep 17 00:00:00 2001 From: Pavel Egorov Date: Wed, 3 Jun 2020 11:12:35 +0300 Subject: [PATCH 2/2] Refactor --- app/views/layouts/shared/_footer.html.slim | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/app/views/layouts/shared/_footer.html.slim b/app/views/layouts/shared/_footer.html.slim index 7995b1af9..7ffeb0da8 100644 --- a/app/views/layouts/shared/_footer.html.slim +++ b/app/views/layouts/shared/_footer.html.slim @@ -1,28 +1,21 @@ footer.bg-light.border-top.mt-auto.py-3 .container-xl - .d-md-flex.justify-content-around - .flex-column + .row.justify-content-lg-around + .col-sm-6.col-md-4.col-lg-auto a.navbar-brand.text-dark.px-0.py-0(href='https://ru.hexlet.io') - h5 © Hexlet + h2.h5 © Hexlet ul.list-unstyled li= link_to t('.about'), page_path('about') li= link_to t('.source_code'), 'https://github.com/Hexlet/hexlet-cv', target: "_blank" li= link_to 'Slack #hexlet-volunteers', 'https://slack-ru.hexlet.io/', target: "_blank" - / .col-12.col-md-4 - / div.h5.mb-3= t('.other_os_projects') - / ul.list-unstyled - / li= link_to 'NodeJS', 'https://github.com/Hexlet/hexlet-interview', target: "_blank" - / li= link_to 'PHP', 'https://github.com/Hexlet/hexlet-sicp', target: "_blank" - / li= link_to 'Java', 'https://github.com/Hexlet/hexlet-correction', target: "_blank" - - .flex-column - h5= t('.help') + .col-sm-6.col-md-4.col-lg-auto + h2.h5= t('.help') ul.list-unstyled li= link_to t('.knowledge'), 'https://ru.hexlet.io/knowledge', target: "_blank" li= link_to t('.blog'), 'https://ru.hexlet.io/blog', target: "_blank" li= link_to t('.recommended_books'), 'https://ru.hexlet.io/pages/recommended-books', target: "_blank" - .flex-column - h5= t('.additionally') + .col-sm-6.col-md-4.col-lg-auto + h2.h5= t('.additionally') ul.list-unstyled li= link_to 'Code Basics', 'https://ru.code-basics.com/', target: "_blank" li= link_to 'Code Battles', 'https://codebattle.hexlet.io/' , target: "_blank"