diff --git a/certif/app/styles/app.scss b/certif/app/styles/app.scss index 25b98aebb35..50c42782a7e 100644 --- a/certif/app/styles/app.scss +++ b/certif/app/styles/app.scss @@ -13,7 +13,6 @@ $navbar-height: 60px; @import 'pages/login'; @import 'pages/session-supervising'; @import 'pages/session-supervising-error'; -@import 'pages/authenticated'; @import 'pages/authenticated/restricted-access'; @import 'pages/authenticated/sessions'; @import 'pages/authenticated/sessions/add-student'; diff --git a/certif/app/styles/components/layout/footer.scss b/certif/app/styles/components/layout/footer.scss index 57e37e14b44..8acb5e960e1 100644 --- a/certif/app/styles/components/layout/footer.scss +++ b/certif/app/styles/components/layout/footer.scss @@ -1,14 +1,13 @@ .footer { display: flex; - flex-direction: row; + flex-direction: column; align-items: center; justify-content: space-between; flex-shrink: 0; - margin: 0 var(--pix-spacing-1x); + line-height: 1; - @include device-is('mobile') { - flex-direction: column; - margin-top: var(--pix-spacing-6x); + @include device-is('desktop') { + flex-direction: row; } &__navigation { @@ -22,13 +21,8 @@ &-list { list-style: none; display: flex; - flex-direction: column; padding: 0; - @include device-is('tablet') { - flex-direction: row; - } - li { align-self: center; display: inline; @@ -41,21 +35,20 @@ color: var(--pix-neutral-500); cursor: default; @extend %pix-body-xs; - padding: 16px 0; } } .footer-navigation { &__item { - margin-right: 3px; + margin-right: var(--pix-spacing-2x); color: var(--pix-neutral-500); @extend %pix-body-s; font-weight: 500; text-decoration: none; @include device-is('desktop') { - margin-right: 12px; + margin-right: var(--pix-spacing-4x); } &.active, &:focus, &:hover { diff --git a/certif/app/styles/pages/authenticated.scss b/certif/app/styles/pages/authenticated.scss deleted file mode 100644 index 87699f0e703..00000000000 --- a/certif/app/styles/pages/authenticated.scss +++ /dev/null @@ -1,13 +0,0 @@ -.authenticated { - display: flex; - flex-direction: column; - justify-content: space-between; -} - -.authenticated-layout { - min-height: 100vh; - - @include device-is('tablet') { - min-height: auto; - } -} diff --git a/certif/app/templates/authenticated.hbs b/certif/app/templates/authenticated.hbs index a7291be4548..3a5c29bfd9b 100644 --- a/certif/app/templates/authenticated.hbs +++ b/certif/app/templates/authenticated.hbs @@ -1,13 +1,16 @@ - - + + <:navigation> + + -
+ <:main>
- {{outlet}}
+ + <:footer> -
+
\ No newline at end of file