aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/app.component.ts4
-rw-r--r--client/src/app/header/header.component.scss4
-rw-r--r--client/src/sass/application.scss6
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 @@
1import { Component, OnInit } from '@angular/core' 1import { Component, OnInit } from '@angular/core'
2import { NavigationEnd, Router } from '@angular/router' 2import { GuardsCheckStart, NavigationEnd, Router } from '@angular/router'
3import { AuthService, ServerService } from '@app/core' 3import { AuthService, ServerService } from '@app/core'
4import { isInMobileView } from '@app/shared/misc/utils' 4import { isInMobileView } from '@app/shared/misc/utils'
5 5
@@ -57,7 +57,7 @@ export class AppComponent implements OnInit {
57 this.router.events.subscribe( 57 this.router.events.subscribe(
58 e => { 58 e => {
59 // User clicked on a link in the menu, change the page 59 // User clicked on a link in the menu, change the page
60 if (e instanceof NavigationEnd && isInMobileView()) { 60 if (e instanceof GuardsCheckStart && isInMobileView()) {
61 this.isMenuDisplayed = false 61 this.isMenuDisplayed = false
62 } 62 }
63 } 63 }
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 @@
37 37
38 margin-right: 25px; 38 margin-right: 25px;
39 39
40 @media screen and (max-width: 800px) {
41 margin-right: 0;
42 }
43
40 .icon.icon-upload { 44 .icon.icon-upload {
41 @include icon(22px); 45 @include icon(22px);
42 46
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 {
367 margin-left: 50px; 367 margin-left: 50px;
368 margin-right: 50px; 368 margin-right: 50px;
369 } 369 }
370
371 .sub-menu {
372 padding-left: 50px;
373 }
370 } 374 }
371 } 375 }
372} 376}
@@ -389,7 +393,7 @@ table {
389 } 393 }
390 394
391 .sub-menu { 395 .sub-menu {
392 padding-left: 10px; 396 padding-left: 15px;
393 margin-bottom: 10px; 397 margin-bottom: 10px;
394 } 398 }
395 399