Skip to content

Commit 72f53b0

Browse files
committed
MD3 and responsive finetunings #11943
1 parent a12f1df commit 72f53b0

File tree

11 files changed

+84
-35
lines changed

11 files changed

+84
-35
lines changed
Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
@use '../../../../../styles/mixins';
2+
@use '@ecodev/natural-layout' as nat;
3+
24
@include mixins.page-with-illustration();
35

4-
.page-illustration {
5-
height: 500px;
6-
}
6+
@include nat.media(sm) {
7+
.page-illustration {
8+
height: 500px;
9+
}
710

8-
#introduction {
9-
position: relative;
10-
top: -100px;
11+
#introduction {
12+
position: relative;
13+
top: -100px;
14+
}
1115
}

client/app/front-office/components/agir-avec-nous/alimentation/alimentation.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="container mat-font-body-lg rich-text">
77
<h1 class="mat-font-headline-lg">ALIMENTATION</h1>
88

9-
<div class="nat-horizontal nat-gap-30">
9+
<div class="nat-vertical nat-sm-horizontal nat-gap-30">
1010
<div class="app-md-expand-70 page-body mat-font-body-lg rich-text">
1111
<p>
1212
De nombreuses personnes – producteurs, transformatrices, distributeurs, restauratrices et mangeurs –

client/app/front-office/components/association/qui-sommes-nous/qui-sommes-nous.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h1 class="mat-font-headline-lg">QUI SOMMES-NOUS ?</h1>
66
<div class="nat-horizontal nat-gap-30">
77
<div class="app-md-expand-70 app-gap-50 nat-vertical page-body mat-font-body-lg rich-text">
88
<div>
9-
<div class="nat-horizontal nat-gap-30">
9+
<div class="nat-vertical nat-sm-horizontal nat-gap-30">
1010
<div class="person nat-md-expand">
1111
<img
1212
src="assets/images/association/susana_jourdan-artisansdelatransition.jpg"

client/app/front-office/components/association/qui-sommes-nous/qui-sommes-nous.component.scss

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
@use '../../../../../styles/mixins';
2+
@use '@ecodev/natural-layout' as nat;
3+
24
@include mixins.page-with-illustration();
35

46
.page-illustration {
57
height: 350px;
68
}
79

8-
.page-illustration-content {
9-
top: -300px;
10-
& > img {
11-
margin-bottom: -250px;
10+
@include nat.media(sm) {
11+
.page-illustration-content {
12+
top: -300px;
13+
& > img {
14+
margin-bottom: -250px;
15+
}
1216
}
1317
}
1418

client/app/front-office/components/faire-un-don/faire-un-don.component.scss

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,3 @@
44
.page-illustration {
55
height: 350px;
66
}
7-
8-
.page-illustration-content {
9-
top: -300px;
10-
& > img {
11-
margin-bottom: -250px;
12-
}
13-
}

client/app/front-office/components/projet/projet.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ <h1 class="mat-font-headline-sm">Aux sources de LaRevueDurable</h1>
4848
Quelques années plus tard, ils ont un peu plus de verbe qu’à leurs débuts (entretien RTS en juin
4949
2008).
5050
</p>
51-
<div class="nat-md-horizontal nat-gap nat-vertical">
51+
<div>
5252
<img
5353
class="vignette"
5454
src="assets/images/illustration-pages/entretien-rts-2008-jacques-mirenowicz.jpg"

client/app/front-office/components/projet/projet.component.scss

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@use '../../../../styles/mixins';
2+
@use '@ecodev/natural-layout' as nat;
23
@include mixins.page-with-illustration();
34

45
.page-illustration-content {
@@ -9,10 +10,24 @@
910
.vignette {
1011
display: block;
1112
margin: 0;
12-
width: 300px;
1313
}
1414

1515
audio {
1616
flex: none !important;
17-
width: 400px;
17+
}
18+
19+
audio,
20+
.vignette {
21+
width: 100%;
22+
max-width: 300px;
23+
}
24+
25+
@include nat.media(null, sm) {
26+
ul {
27+
padding-left: 0;
28+
29+
li::before {
30+
content: '';
31+
}
32+
}
1833
}

client/app/front-office/front-office.component.html

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@
3434
</ng-template>
3535

3636
<mat-sidenav-container>
37-
<mat-sidenav #menu position="end" [opened]="menuOpened">
37+
<mat-sidenav #menu id="mobile-menu-sidenav" position="end" [opened]="menuOpened">
38+
<button id="mobile-hamburger-menu" matIconButton (click)="menu.toggle()">
39+
<mat-icon naturalIcon="menu" />
40+
</button>
41+
3842
<!-- menu mobile -->
3943
<div id="mobile-menu">
4044
<ng-container *ngTemplateOutlet="mobileNavigationTemplate; context: {$implicit: mobileNavigation}" />
@@ -51,13 +55,15 @@
5155

5256
<mat-sidenav-content>
5357
<mat-toolbar class="nat-horizontal nat-align nat-md-hide" id="header-mobile">
54-
<div class="nat-expand"></div>
58+
<div class="nat-expand nat-sm-show"></div>
5559

56-
<a routerLink="/"><img alt="logo" height="30" src="assets/logo-artisans-de-la-transition.svg" /></a>
60+
<a id="mobile-menu-logo" routerLink="/"
61+
><img alt="logo" height="30" src="assets/logo-artisans-de-la-transition.svg"
62+
/></a>
5763

5864
<div class="nat-expand"></div>
5965

60-
<button matIconButton (click)="menu.toggle()">
66+
<button id="hamburger-menu" matIconButton (click)="menu.toggle()">
6167
<mat-icon naturalIcon="menu" />
6268
</button>
6369
</mat-toolbar>

client/app/front-office/front-office.component.scss

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,15 @@ app-breadcrumbs {
206206
}
207207
}
208208

209+
#mobile-menu-sidenav {
210+
@include mat.sidenav-overrides(
211+
(
212+
container-width: 100%,
213+
container-shape: 0,
214+
)
215+
);
216+
}
217+
209218
#mobile-menu {
210219
margin-top: 20px;
211220
min-width: 300px;
@@ -216,7 +225,6 @@ app-breadcrumbs {
216225
align-items: center;
217226
cursor: pointer;
218227
padding: 0 24px;
219-
220228
height: 48px;
221229
color: black;
222230
font-size: 16px;
@@ -242,6 +250,17 @@ app-breadcrumbs {
242250
}
243251
}
244252

253+
#mobile-menu-logo {
254+
img {
255+
max-width: calc(100vw - 80px);
256+
}
257+
}
258+
259+
#mobile-hamburger-menu {
260+
float: right;
261+
margin-right: 20px;
262+
}
263+
245264
#mobile-menu .mat-expansion-panel-body {
246265
padding-right: 0 !important;
247266
}

client/app/front-office/modules/cart/components/cart/cart.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
:host {
1616
@include responsive.responsive(responsive.$lt-md) {
1717
.cart-buttons > * {
18-
min-width: 300px !important;
18+
min-width: 100% !important;
1919
}
2020
}
2121
}

0 commit comments

Comments
 (0)