From dd7789417181d202061ce5f693f1f72ab8d243c3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 31 Jan 2018 11:58:11 +0100 Subject: [PATCH] Fix responsive with modale and menu displayed --- client/src/app/app.component.ts | 4 ++-- client/src/app/header/header.component.scss | 4 ++++ client/src/sass/application.scss | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index d2678096f..55c7bbf99 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core' -import { NavigationEnd, Router } from '@angular/router' +import { GuardsCheckStart, NavigationEnd, Router } from '@angular/router' import { AuthService, ServerService } from '@app/core' import { isInMobileView } from '@app/shared/misc/utils' @@ -57,7 +57,7 @@ export class AppComponent implements OnInit { this.router.events.subscribe( e => { // User clicked on a link in the menu, change the page - if (e instanceof NavigationEnd && isInMobileView()) { + if (e instanceof GuardsCheckStart && isInMobileView()) { this.isMenuDisplayed = false } } diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss index d589d66c9..63b724cba 100644 --- a/client/src/app/header/header.component.scss +++ b/client/src/app/header/header.component.scss @@ -37,6 +37,10 @@ margin-right: 25px; + @media screen and (max-width: 800px) { + margin-right: 0; + } + .icon.icon-upload { @include icon(22px); diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 84ffbec65..340221002 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -367,6 +367,10 @@ table { margin-left: 50px; margin-right: 50px; } + + .sub-menu { + padding-left: 50px; + } } } } @@ -389,7 +393,7 @@ table { } .sub-menu { - padding-left: 10px; + padding-left: 15px; margin-bottom: 10px; } -- 2.25.1