From fbf14cd130c6f7f73697fad28730da485cb7c946 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Wed, 19 Sep 2018 15:52:39 -0230
Subject: Prevent loading screen from overlaying the app bar

Refs #4417

This change is functional copy of 3893469 that solves the problem in a way
that doesn't depend on the height of the app bar since the app bar isn't a
fixed height in the smaller views.
---
 ui/app/components/page-container/index.scss | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ui/app/components/page-container/index.scss')

diff --git a/ui/app/components/page-container/index.scss b/ui/app/components/page-container/index.scss
index 14cdbacd3..61434cbcf 100644
--- a/ui/app/components/page-container/index.scss
+++ b/ui/app/components/page-container/index.scss
@@ -182,5 +182,7 @@
     max-height: 82vh;
     min-height: 570px;
     flex: 0 0 auto;
+    margin-right: auto;
+    margin-left: auto;
   }
 }
-- 
cgit v1.2.3


From 2e5a09e28c07b2b3865d3eb0112d8705e99f572d Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Mon, 24 Sep 2018 00:47:54 -0230
Subject: Have PageContainerFooter take children node

---
 ui/app/components/page-container/index.scss | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

(limited to 'ui/app/components/page-container/index.scss')

diff --git a/ui/app/components/page-container/index.scss b/ui/app/components/page-container/index.scss
index 61434cbcf..b7bf1b8b5 100644
--- a/ui/app/components/page-container/index.scss
+++ b/ui/app/components/page-container/index.scss
@@ -43,10 +43,9 @@
 
   &__footer {
     display: flex;
-    flex-flow: row;
+    flex-flow: column;
     justify-content: center;
     border-top: 1px solid $geyser;
-    padding: 16px;
     flex: 0 0 auto;
 
     .btn-default,
@@ -55,6 +54,30 @@
     }
   }
 
+  &__footer-header {
+    display: flex;
+    flex-flow: row;
+    justify-content: center;
+    padding: 16px;
+    flex: 0 0 auto;
+  }
+
+  &__footer-footer {
+    display: flex;
+    flex-flow: row;
+    justify-content: space-around;
+    padding: 0 16px 16px;
+    flex: 0 0 auto;
+
+    a, a:hover {
+      text-decoration: none;
+      cursor: pointer;
+      font-size: 0.75rem;
+      text-transform: uppercase;
+      color: #2f9ae0;
+    }
+  }
+
   &__footer-button {
     height: 55px;
     font-size: 1rem;
-- 
cgit v1.2.3


From e351a7dd7439d65b47321c9ce18e661da67929ee Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Mon, 1 Oct 2018 10:34:11 -0230
Subject: Switch page-container__footer-* for header and footer tags

---
 ui/app/components/page-container/index.scss | 42 ++++++++++++++---------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'ui/app/components/page-container/index.scss')

diff --git a/ui/app/components/page-container/index.scss b/ui/app/components/page-container/index.scss
index b7bf1b8b5..6742e3082 100644
--- a/ui/app/components/page-container/index.scss
+++ b/ui/app/components/page-container/index.scss
@@ -52,29 +52,29 @@
     .btn-confirm {
       font-size: 1rem;
     }
-  }
 
-  &__footer-header {
-    display: flex;
-    flex-flow: row;
-    justify-content: center;
-    padding: 16px;
-    flex: 0 0 auto;
-  }
-
-  &__footer-footer {
-    display: flex;
-    flex-flow: row;
-    justify-content: space-around;
-    padding: 0 16px 16px;
-    flex: 0 0 auto;
+    header {
+      display: flex;
+      flex-flow: row;
+      justify-content: center;
+      padding: 16px;
+      flex: 0 0 auto;
+    }
 
-    a, a:hover {
-      text-decoration: none;
-      cursor: pointer;
-      font-size: 0.75rem;
-      text-transform: uppercase;
-      color: #2f9ae0;
+    footer {
+      display: flex;
+      flex-flow: row;
+      justify-content: space-around;
+      padding: 0 16px 16px;
+      flex: 0 0 auto;
+
+      a, a:hover {
+        text-decoration: none;
+        cursor: pointer;
+        font-size: 0.75rem;
+        text-transform: uppercase;
+        color: #2f9ae0;
+      }
     }
   }
 
-- 
cgit v1.2.3