Skip to content

Commit

Permalink
Merge pull request #60 from PnEcrins/feat/ui2
Browse files Browse the repository at this point in the history
Feat/ui2
  • Loading branch information
TheoLechemia authored Jul 30, 2024
2 parents 27ff26c + 4818814 commit 72e7b64
Show file tree
Hide file tree
Showing 18 changed files with 298 additions and 283 deletions.
157 changes: 79 additions & 78 deletions front-end/m3-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,101 +8,101 @@
$_palettes: (
primary: (
0: #000000,
10: #2b1700,
20: #482a00,
25: #573300,
30: #663e00,
35: #764800,
40: #875300,
50: #a96900,
60: #cc7f00,
70: #ee9815,
80: #ffb964,
90: #ffddba,
95: #ffeedf,
98: #fff8f4,
10: #341100,
20: #552000,
25: #672800,
30: #793100,
35: #8b3900,
40: #f07217,
50: #c65500,
60: #ef6800,
70: #ff8d4d,
80: #ffb691,
90: #ffdbcb,
95: #ffede6,
98: #fff8f6,
99: #fffbff,
100: #ffffff,
),
secondary: (
0: #000000,
10: #002105,
20: #00390e,
25: #004613,
30: #005318,
35: #00601d,
40: #006e23,
50: #008a2e,
60: #27a642,
70: #49c25a,
80: #66df72,
90: #83fc8b,
95: #c7ffc3,
98: #ebffe5,
99: #f6fff0,
10: #00201a,
20: #00382e,
25: #004438,
30: #005143,
35: #005e4e,
40: #006b5a,
50: #008771,
60: #00a38a,
70: #00c1a3,
80: #00dfbe,
90: #29fed9,
95: #b7ffeb,
98: #e6fff6,
99: #f3fff9,
100: #ffffff,
),
tertiary: (
0: #000000,
10: #001f24,
20: #00363d,
25: #00424a,
30: #004f58,
35: #005b66,
40: #006874,
50: #008391,
60: #00a0b0,
70: #22bccf,
80: #4fd8eb,
90: #97f0ff,
95: #d0f8ff,
98: #edfcff,
99: #f6feff,
10: #1f1c00,
20: #353107,
25: #403c12,
30: #4c481c,
35: #585427,
40: #656031,
50: #7e7848,
60: #98925f,
70: #b3ad77,
80: #cfc890,
90: #ece4aa,
95: #fbf2b7,
98: #fff9e4,
99: #fffbff,
100: #ffffff,
),
neutral: (
0: #000000,
4: #000c0e,
6: #001316,
10: #001f24,
12: #002429,
17: #002f35,
20: #00363d,
22: #003b42,
24: #004047,
25: #00424a,
30: #004f58,
35: #005b66,
40: #006874,
50: #008391,
60: #00a0b0,
70: #22bccf,
80: #4fd8eb,
87: #81e9f9,
90: #97f0ff,
92: #aef3ff,
94: #c5f6ff,
95: #d0f8ff,
96: #daf9ff,
98: #edfcff,
99: #f6feff,
10: #201a18,
20: #362f2c,
25: #413a37,
30: #4d4542,
35: #59514d,
40: #655d59,
50: #7f7571,
60: #998f8a,
70: #b4a9a5,
80: #d0c4bf,
90: #ede0db,
95: #fbeee9,
98: #fff8f6,
99: #fffbff,
100: #ffffff,
4: #120d0b,
6: #181210,
12: #241e1b,
17: #2f2926,
22: #3a3330,
24: #3f3834,
87: #e4d7d3,
92: #f2e6e1,
94: #f8ebe6,
96: #fef1ec,
),
neutral-variant: (
0: #000000,
10: #231a11,
20: #392f24,
25: #443a2f,
30: #50453a,
35: #5c5045,
40: #695c50,
50: #827568,
60: #9d8e81,
70: #b8a99a,
80: #d4c4b5,
90: #f1e0d0,
95: #ffeedf,
98: #fff8f4,
10: #241913,
20: #3b2e27,
25: #463832,
30: #52443d,
35: #5f4f48,
40: #6b5b54,
50: #85736c,
60: #a08d85,
70: #bba79e,
80: #d7c2b9,
90: #f4ded5,
95: #ffede6,
98: #fff8f6,
99: #fffbff,
100: #ffffff,
),
Expand All @@ -126,6 +126,7 @@ $_palettes: (
),
);


$_rest: (
secondary: map.get($_palettes, secondary),
neutral: map.get($_palettes, neutral),
Expand Down
Binary file modified front-end/public/favicon.ico
Binary file not shown.
Binary file removed front-end/public/icons/icon-128x128.png
Binary file not shown.
Binary file modified front-end/public/icons/icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified front-end/public/icons/icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified front-end/public/icons/icon-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front-end/public/icons/icon-36x36.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified front-end/public/icons/icon-384x384.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front-end/public/icons/icon-48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified front-end/public/icons/icon-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified front-end/public/icons/icon-72x72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified front-end/public/icons/icon-96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front-end/public/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion front-end/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
>
</button>
<a routerLink="/" class="logo-container">
<img src="favicon.ico" />
<img height="48" src="logo.png" />
</a>
<span class="bold main-color">Regard d'altitude</span>
<span class="toolbar-spacer"></span>
Expand Down
2 changes: 1 addition & 1 deletion front-end/src/app/pages/home/home.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h1 id="text-banner">Un collectif pour voir changer la montagne</h1>
<mat-card class="col-6 hover mb-3">
<img id="map-img"/>
<button
mat-flat-button
mat-flat-button
extended
color="primary"
class="card-button"
Expand Down
4 changes: 3 additions & 1 deletion front-end/src/app/pages/home/home.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ mat-card img {
@media (max-width: 992px) {
#text-banner {
font-size: x-large ;
font: revert!important;
}
}

Expand All @@ -63,7 +64,8 @@ mat-card img {
left: 50%;
transform: translate(-50%, -50%);
font-weight: bold;
color: #ffa007;
color: var(--mdc-filled-button-container-color);
font-family: Afacad!important;
}

#map-img {
Expand Down
Loading

0 comments on commit 72e7b64

Please sign in to comment.