Skip to content

Commit ad18fa4

Browse files
committed
feat(orga): move footer at the bottom of the page
1 parent 72437c6 commit ad18fa4

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

orga/app/styles/components/layout/footer.scss

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
flex-shrink: 0;
55
align-items: center;
66
justify-content: space-between;
7-
margin: 0 var(--pix-spacing-6x);
8-
border-top: 1px solid var(--pix-neutral-20);
97

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

12+
line-height: 1;
13+
1414
&__navigation {
1515
display: flex;
1616
flex-direction: column;
@@ -33,7 +33,6 @@
3333
}
3434

3535
&__copyrights {
36-
padding: 16px 0;
3736
color: var(--pix-neutral-20)0;
3837
font-size: 0.75rem;
3938
font-family: $font-roboto;

orga/app/styles/components/ui/action-bar.scss

-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,3 @@
3030
}
3131
}
3232
}
33-
34-
footer {
35-
padding: var(--pix-spacing-4x) var(--pix-spacing-6x);
36-
}

orga/app/templates/authenticated.hbs

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
<PixAppLayout @variant="orga" class="app">
2-
<Layout::Sidebar @placesCount={{@model.available}} @onChangeOrganization={{this.onChangeOrganization}} />
2+
<:navigation>
33

4-
<main class="main-content__body page">
5-
<Banner::TopBanners />
6-
{{outlet}}
7-
<Layout::Footer />
8-
</main>
4+
<Layout::Sidebar @placesCount={{@model.available}} @onChangeOrganization={{this.onChangeOrganization}} />
5+
</:navigation>
6+
<:main>
97

8+
<main class="main-content__body page">
9+
<Banner::TopBanners />
10+
{{outlet}}
11+
</main>
12+
</:main>
13+
<:footer>
14+
<Layout::Footer />
15+
</:footer>
1016
</PixAppLayout>
1117
<NotificationContainer @position="bottom-right" />

0 commit comments

Comments
 (0)