Skip to content

Commit

Permalink
[FEATURE] déplace le footer d'orga en base de la page (pix-15615)
Browse files Browse the repository at this point in the history
  • Loading branch information
pix-service-auto-merge authored Dec 17, 2024
2 parents 6c9a5f0 + 1b79e7b commit 393fa69
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 18 deletions.
5 changes: 2 additions & 3 deletions orga/app/styles/components/layout/footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
flex-shrink: 0;
align-items: center;
justify-content: space-between;
margin: 0 var(--pix-spacing-6x);
border-top: 1px solid var(--pix-neutral-20);

@include device-is('desktop') {
flex-direction: row;
}

line-height: 1;

&__navigation {
display: flex;
flex-direction: column;
Expand All @@ -33,7 +33,6 @@
}

&__copyrights {
padding: 16px 0;
color: var(--pix-neutral-20)0;
font-size: 0.75rem;
font-family: $font-roboto;
Expand Down
4 changes: 0 additions & 4 deletions orga/app/styles/components/ui/action-bar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,3 @@
}
}
}

footer {
padding: var(--pix-spacing-4x) var(--pix-spacing-6x);
}
18 changes: 12 additions & 6 deletions orga/app/templates/authenticated.hbs
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
<PixAppLayout @variant="orga" class="app">
<Layout::Sidebar @placesCount={{@model.available}} @onChangeOrganization={{this.onChangeOrganization}} />
<:navigation>

<main class="main-content__body page">
<Banner::TopBanners />
{{outlet}}
<Layout::Footer />
</main>
<Layout::Sidebar @placesCount={{@model.available}} @onChangeOrganization={{this.onChangeOrganization}} />
</:navigation>
<:main>

<main class="main-content__body page">
<Banner::TopBanners />
{{outlet}}
</main>
</:main>
<:footer>
<Layout::Footer />
</:footer>
</PixAppLayout>
<NotificationContainer @position="bottom-right" />
8 changes: 4 additions & 4 deletions orga/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion orga/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@1024pix/ember-matomo-tag-manager": "^2.4.3",
"@1024pix/ember-testing-library": "^3.0.6",
"@1024pix/eslint-config": "^1.3.8",
"@1024pix/pix-ui": "^51.2.0",
"@1024pix/pix-ui": "^52.0.0",
"@1024pix/stylelint-config": "^5.1.24",
"@babel/eslint-parser": "^7.19.1",
"@babel/plugin-proposal-decorators": "^7.20.13",
Expand Down

0 comments on commit 393fa69

Please sign in to comment.