From 8060a34a5b77ed84cdb1bb594c21aed965f21ea5 Mon Sep 17 00:00:00 2001 From: Chris Kaczor Date: Wed, 2 Oct 2019 17:44:08 -0400 Subject: [PATCH] Layout improvements --- .../dashboard/dashboard.component.html | 4 +++- .../dashboard/dashboard.component.scss | 3 +++ .../components/laundry/laundry.component.scss | 1 + .../src/app/components/nav/nav.component.scss | 4 ---- .../charts/weather-charts.component.scss | 17 ++++++----------- .../current/weather-current.component.scss | 1 + 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Display/src/app/components/dashboard/dashboard.component.html b/Display/src/app/components/dashboard/dashboard.component.html index 12be361..101bc00 100644 --- a/Display/src/app/components/dashboard/dashboard.component.html +++ b/Display/src/app/components/dashboard/dashboard.component.html @@ -1 +1,3 @@ -dashboard works! +
+ dashboard works! +
diff --git a/Display/src/app/components/dashboard/dashboard.component.scss b/Display/src/app/components/dashboard/dashboard.component.scss index e69de29..20dd4e3 100644 --- a/Display/src/app/components/dashboard/dashboard.component.scss +++ b/Display/src/app/components/dashboard/dashboard.component.scss @@ -0,0 +1,3 @@ +.dashboard { + padding: 20px; +} diff --git a/Display/src/app/components/laundry/laundry.component.scss b/Display/src/app/components/laundry/laundry.component.scss index 52fa7a3..344b5d1 100644 --- a/Display/src/app/components/laundry/laundry.component.scss +++ b/Display/src/app/components/laundry/laundry.component.scss @@ -1,5 +1,6 @@ .laundry-current { font-size: 14px; + padding: 20px; } .laundry-current-header { diff --git a/Display/src/app/components/nav/nav.component.scss b/Display/src/app/components/nav/nav.component.scss index 841c458..2077b3d 100644 --- a/Display/src/app/components/nav/nav.component.scss +++ b/Display/src/app/components/nav/nav.component.scss @@ -16,10 +16,6 @@ z-index: 1; } -.mat-sidenav-content { - padding: 20px; -} - .nav-caption { padding-left: 8px; } diff --git a/Display/src/app/components/weather/charts/weather-charts.component.scss b/Display/src/app/components/weather/charts/weather-charts.component.scss index 092c691..4491b53 100644 --- a/Display/src/app/components/weather/charts/weather-charts.component.scss +++ b/Display/src/app/components/weather/charts/weather-charts.component.scss @@ -1,22 +1,17 @@ .chart-content { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; + display: flex; + flex-flow: column; + height: 100%; } #chart { - position: absolute; - top: 50px; - bottom: 50px; - left: 0; - right: 0; + flex: 1 1 auto; } .chart-header { background-color: rgb(250, 250, 250); - height: 50px; + padding: 0 20px; + flex: 0 0 auto; } .chart-button-spacer { diff --git a/Display/src/app/components/weather/current/weather-current.component.scss b/Display/src/app/components/weather/current/weather-current.component.scss index 3f683af..969a580 100644 --- a/Display/src/app/components/weather/current/weather-current.component.scss +++ b/Display/src/app/components/weather/current/weather-current.component.scss @@ -1,5 +1,6 @@ .weather-current { font-size: 14px; + padding: 20px; } .weather-current-header {