From 5dfde743763e8739f0c92f05fa3a0abba95511c8 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Fri, 7 Jun 2019 11:26:50 -0700
Subject: [PATCH] For #1881 - Uses flex box to pin button to the bottom

---
 .../main/res/raw/low_and_medium_risk_error_style.css  | 11 ++++-------
 app/src/main/res/raw/low_risk_error_pages.html        |  4 +++-
 .../res/raw/medium_and_high_risk_error_pages.html     |  4 +++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/raw/low_and_medium_risk_error_style.css b/app/src/main/res/raw/low_and_medium_risk_error_style.css
index 710799ac5..3486910e7 100644
--- a/app/src/main/res/raw/low_and_medium_risk_error_style.css
+++ b/app/src/main/res/raw/low_and_medium_risk_error_style.css
@@ -44,7 +44,7 @@ li > button {
 }
 
 /* Push the #ignoreWarningButton to the bottom on the blocked site page */
-.blockedsite > #errorPageContainer > #errorLongContent {
+#errorLongContent {
   flex: 1;
 }
 
@@ -67,6 +67,7 @@ p {
 button {
   /* Force buttons to display: block here to try and enforce collapsing margins */
   display: block;
+  flex: 0;
   height: 36px;
   width: 100%;
   border-radius: 5px;
@@ -77,11 +78,10 @@ button {
   line-height:16px;
   font-size: 14px;
   font-weight: bold;
-  position: fixed;
-  bottom: 20px;
   text-aligned:center;
   vertical-aligned:center;
   background-image: none;
+  margin-bottom: 20px;
 }
 
 button.inProgress {
@@ -117,10 +117,7 @@ button.inProgress {
    * This number should be kept in sync with the media query for tablets below */
   max-width: 550px;
   margin: 0 auto;
-  transform: translateY(var(--moz-background-height));
-  padding-bottom: var(--moz-vertical-spacing);
-
-  min-height: calc(100% - var(--moz-background-height) - var(--moz-vertical-spacing));
+  min-height: 100%;
   display: flex;
   flex-direction: column;
 }
diff --git a/app/src/main/res/raw/low_risk_error_pages.html b/app/src/main/res/raw/low_risk_error_pages.html
index 13652d719..27b70ccee 100644
--- a/app/src/main/res/raw/low_risk_error_pages.html
+++ b/app/src/main/res/raw/low_risk_error_pages.html
@@ -32,7 +32,9 @@
             </div>
 
             <!-- Retry Button -->
-            <button id="errorTryAgain" onclick="window.location.reload()">%button%</button>
+            <div id="buttonWrapper">
+                <button id="errorTryAgain" onclick="window.location.reload()">%button%</button>
+            </div>
         </div>
     </body>
 </html>
diff --git a/app/src/main/res/raw/medium_and_high_risk_error_pages.html b/app/src/main/res/raw/medium_and_high_risk_error_pages.html
index 0fb2d097b..a97683b02 100644
--- a/app/src/main/res/raw/medium_and_high_risk_error_pages.html
+++ b/app/src/main/res/raw/medium_and_high_risk_error_pages.html
@@ -32,7 +32,9 @@
             </div>
 
             <!-- Retry Button -->
-            <button id="errorTryAgain" onclick="window.history.back() ">%backButton%</button>
+            <div id="buttonWrapper">
+                <button id="errorTryAgain" onclick="window.history.back() ">%backButton%</button>
+            </div>
         </div>
     </body>
 </html>