From eee83c03d5a8a93a32b52f86eb09fb1837f04044 Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Wed, 6 Nov 2019 13:38:37 +0100
Subject: [PATCH] Fix some styling

---
 .../src/fm-map/components/map/map.component.html       | 10 ++++++----
 .../src/fm-map/components/map/map.component.scss       |  9 +++++++--
 projects/common-map/tslint.json                        |  4 ++--
 projects/common/tslint.json                            |  4 ++--
 src/app/menu/menu.component.scss                       |  2 --
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/projects/common-map/src/fm-map/components/map/map.component.html b/projects/common-map/src/fm-map/components/map/map.component.html
index 6ad1c2a..efe5cb2 100644
--- a/projects/common-map/src/fm-map/components/map/map.component.html
+++ b/projects/common-map/src/fm-map/components/map/map.component.html
@@ -45,11 +45,13 @@
 <fm-side-panel [visible]="(menuVisible|async)" class="menu">
   <div class="container-fluid">
     <div class="body">
-      <div class="logo">
-        <router-outlet name="side-panel-logo"></router-outlet>
-        <span><button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu($event)"><i class="fa fa-times" aria-hidden="true"></i></button></span>
+      <div class="d-flex flex-row">
+        <div class="mt-2 mb-2 flex-grow-1 logo"><router-outlet name="side-panel-logo"></router-outlet></div>
+        <div class="mt-2 mb-2 ml-2"><button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu($event)"><i class="fa fa-times" aria-hidden="true"></i></button></div>
       </div>
-      <router-outlet name="side-panel-menu"></router-outlet>          
+      <div class="d-flex flex-column cards"> 
+          <router-outlet name="side-panel-menu"></router-outlet>          
+      </div>      
   </div>
   </div>
 </fm-side-panel>
diff --git a/projects/common-map/src/fm-map/components/map/map.component.scss b/projects/common-map/src/fm-map/components/map/map.component.scss
index 71dac1a..6697306 100644
--- a/projects/common-map/src/fm-map/components/map/map.component.scss
+++ b/projects/common-map/src/fm-map/components/map/map.component.scss
@@ -85,16 +85,21 @@ switch2d3d {
   font-style:italic;
 }
 
-div.logo {
+div.header {
   display:flex;
   padding-top:1em;
   margin-bottom:1em;
 }
 
-div.logo button {
+div.header button {
   margin-left:1em;
 }
 
+.logo {
+  overflow: hidden;
+  max-height: 2.5em;
+}
+
 timespan {
   position: absolute;
   transition: left 0.5s;
diff --git a/projects/common-map/tslint.json b/projects/common-map/tslint.json
index 124133f..54923c8 100644
--- a/projects/common-map/tslint.json
+++ b/projects/common-map/tslint.json
@@ -4,13 +4,13 @@
     "directive-selector": [
       true,
       "attribute",
-      "lib",
+      "fm-map",
       "camelCase"
     ],
     "component-selector": [
       true,
       "element",
-      "lib",
+      "fm-map",
       "kebab-case"
     ]
   }
diff --git a/projects/common/tslint.json b/projects/common/tslint.json
index 124133f..04e807f 100644
--- a/projects/common/tslint.json
+++ b/projects/common/tslint.json
@@ -4,13 +4,13 @@
     "directive-selector": [
       true,
       "attribute",
-      "lib",
+      "fm",
       "camelCase"
     ],
     "component-selector": [
       true,
       "element",
-      "lib",
+      "fm",
       "kebab-case"
     ]
   }
diff --git a/src/app/menu/menu.component.scss b/src/app/menu/menu.component.scss
index b3a923a..52d93b6 100644
--- a/src/app/menu/menu.component.scss
+++ b/src/app/menu/menu.component.scss
@@ -1,7 +1,5 @@
 .menu-card {
-    margin-left:-7px;
     padding-left:7px;
-    margin-right:-7px;
     padding-right:7px;
     margin-bottom:7px;
   }