From 647aa39085f0c54beeeee3b547d729ca5a5902f2 Mon Sep 17 00:00:00 2001
From: Zak Timson <zaktimson@gmail.com>
Date: Thu, 15 Nov 2018 13:56:45 -0500
Subject: [PATCH] Fixed styling on both desktop and mobile

---
 src/app/app.component.html             |  2 +-
 src/app/battery/battery.component.html | 30 +++++++++++++-------------
 src/app/battery/battery.component.ts   |  5 +++--
 src/styles.scss                        |  8 +++++++
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index 92427c1..9c07738 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -6,7 +6,7 @@
         <small class="text-muted ml-2">v{{environment.version}}</small>
     </span>
 </mat-toolbar>
-<mat-drawer-container [hasBackdrop]="false" style="height: calc(100vh - 64px)">
+<mat-drawer-container [hasBackdrop]="false" [ngClass]="{'mobile-height': mobile, 'desktop-height': !mobile}">
     <mat-drawer class="bg-primary" [mode]="mobile ? 'push' : 'side'" [opened]="open" [disableClose]="!mobile" [autoFocus]="false">
         <mat-nav-list class="p-0">
             <mat-divider></mat-divider>
diff --git a/src/app/battery/battery.component.html b/src/app/battery/battery.component.html
index 44d1059..d4017df 100644
--- a/src/app/battery/battery.component.html
+++ b/src/app/battery/battery.component.html
@@ -4,26 +4,26 @@
 </h1>
 <div class="d-flex flex-column flex-md-row" style="min-height: 400px">
     <div class="flex-grow-1 flex-basis-0 mb-3" style="overflow: hidden; height: 400px">
-        <h5 class="pl-2">Charge</h5>
         <ngx-charts-bar-vertical #chart1
-            [results]="batteryService.percentageData"
-            [scheme]="airScheme"
-            [xAxis]="true"
-            [yAxis]="true"
-            [yScaleMin]="0"
-            [yScaleMax]="100"
+                                 [results]="batteryService.percentageData"
+                                 [scheme]="airScheme"
+                                 [xAxis]="true"
+                                 [yAxis]="true"
+                                 [yScaleMin]="0"
+                                 [yScaleMax]="100"
         ></ngx-charts-bar-vertical>
     </div>
     <div class="flex-grow-1 flex-basis-0 mb-3" style="overflow: hidden; height: 400px">
-        <h5 class="pl-2">Temperature</h5>
         <ngx-charts-bar-vertical #chart2
-            [results]="batteryService.temperatureData"
-            [scheme]="fireScheme"
-            schemeType="linear"
-            [xAxis]="true"
-            [yAxis]="true"
-            [yScaleMin]="0"
-            [yScaleMax]="100"
+                                 [results]="batteryService.temperatureData"
+                                 [scheme]="fireScheme"
+                                 schemeType="linear"
+                                 [xAxis]="true"
+                                 [yAxis]="true"
+                                 [yScaleMin]="0"
+                                 [yScaleMax]="100"
+                                 legendTitle="Temperature"
+                                 [legend]="!app.mobile"
         ></ngx-charts-bar-vertical>
     </div>
 </div>
diff --git a/src/app/battery/battery.component.ts b/src/app/battery/battery.component.ts
index 662345d..44f109a 100644
--- a/src/app/battery/battery.component.ts
+++ b/src/app/battery/battery.component.ts
@@ -1,6 +1,7 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
 import {BatteryService} from './battery.service';
 import {BarVerticalComponent} from '@swimlane/ngx-charts/release/bar-chart';
+import {AppComponent} from '../app.component';
 
 @Component({
     selector: 'app-batterys',
@@ -19,12 +20,12 @@ export class BatteryComponent implements OnInit {
 
     fireScheme = {
         name: 'flame',
-        selectable: false,
+        selectable: true,
         group: 'Continuous',
         domain: ['#00deff', '#3db0ff', '#a274d7', '#c42576', '#9f0000']
     };
 
-    constructor(public batteryService: BatteryService) { }
+    constructor(public app: AppComponent, public batteryService: BatteryService) { }
 
     ngOnInit() {
         setTimeout(() => {
diff --git a/src/styles.scss b/src/styles.scss
index d19677f..3e12b85 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -35,6 +35,14 @@ html, body {
     }
 }
 
+.mobile-height{
+    height: calc(100vh - 56px);
+}
+
+.desktop-height{
+    height: calc(100vh - 64px);
+}
+
 .center {
     position: fixed;
     left: 50%;