Skip to content
Snippets Groups Projects
Commit 88b4ca0a authored by Jérémie BRISON's avatar Jérémie BRISON
Browse files

Merge branch 'dev' into feat/post-details

parents 1ac66438 87f5c2c9
No related branches found
No related tags found
3 merge requests!103Recette,!102Dev,!89Feat/post details
......@@ -21,5 +21,14 @@ export class AppComponent {
if (this.authService.isLoggedIn()) {
this.profilService.getProfile();
}
this.setHeightApp();
window.addEventListener('resize', () => {
this.setHeightApp();
});
}
private setHeightApp(): void {
const vh = window.innerHeight * 0.01;
document.documentElement.style.setProperty('--vh', `${vh}px`);
}
}
......@@ -62,7 +62,7 @@
fxLayoutAlign="space-between center"
fxLayoutAlign.lt-sm="center"
>
<h2 class="no-wrap">
<h2>
{{ isJoinMode ? 'Rejoindre' : 'Revendiquer' }} la structure <span>{{ claimStructure.structureName }}</span>
</h2>
<div>
......
......@@ -16,11 +16,11 @@ h3 {
.form {
background: white;
width: 100vw;
height: calc(100vh - #{$header-height} - #{$footer-height});
height: calc(var(--vh, 1vh) * 100 - #{$header-height} - #{$footer-height});
top: #{$header-height};
z-index: $structure-details-z-index;
@media #{$tablet} {
height: calc(100vh - #{$header-height});
height: calc(var(--vh, 1vh) * 100 - #{$header-height});
position: fixed; //Hide default header app.
}
}
......@@ -115,9 +115,6 @@ h3 {
span {
color: $secondary-color;
}
&.no-wrap {
white-space: nowrap;
}
}
h3 {
@include cn-bold-26;
......@@ -137,7 +134,6 @@ h3 {
height: auto;
color: $grey-1;
&.home {
height: 100%;
.btnStart {
margin-top: 90px;
margin-bottom: 10px;
......
......@@ -101,7 +101,7 @@ a {
animation: slideMenu 0.5s;
.menu-content {
background-color: $white;
height: 100vh;
height: calc(var(--vh, 1vh) * 100);
width: 350px;
padding: 27px 25px;
}
......
......@@ -74,9 +74,6 @@ a {
&.full-screen {
min-height: calc(100vh - #{$header-height} - #{$footer-height});
}
@media #{$phone} {
padding-top: 30px;
}
}
.section-container {
width: 80%;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment