From 272b4786b7c935ead38a4a75af7a578a47f6aad2 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Wed, 5 Oct 2022 20:09:37 +0000
Subject: [PATCH] 0.4.2-devel (#34)

Fix issues #29, #30, #31.

Partial fix for #23 on mobile devices.  #23 still needs more work and possible a redesign of the menu.

Reviewed-on: https://git.fjla.uk/fred.boniface/athena.fb-infra.uk/pulls/34
---
 index.php                |  5 +++--
 issue.php                |  2 +-
 page-blocks/nav-menu.php |  4 ++--
 php/version.php          |  2 +-
 styles/style.css         | 16 ++++++++++------
 submit-done.php          |  4 ++--
 6 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/index.php b/index.php
index 48bdb04..67472de 100644
--- a/index.php
+++ b/index.php
@@ -17,11 +17,12 @@
     <?php require "./page-blocks/title-image.php";?>
 
       <br>
-
+      <br>
+      <br>
+      <br>
       <input class="lookup-box" type="text" id="crs-lookup" name="crs-lookup" placeholder="Enter CRS/TIPLOC"/>
       <br>
       <button class="lookup-button" onclick="getTextEntry()">Lookup Departure Board</button>
-
       <br>
       <br>
 
diff --git a/issue.php b/issue.php
index 4865564..2336c2c 100644
--- a/issue.php
+++ b/issue.php
@@ -31,7 +31,7 @@
      sendInput($title,$body);
 
      // Redirect to submit-done.php
-     echo "<script>setTimeout(function(){window.location.href = '/submit-done.php';}, 100);</script>";
+     echo "<script>setTimeout(function(){window.location.href = '/submit-done.php';}, 10);</script>";
    };
    ?>
 
diff --git a/page-blocks/nav-menu.php b/page-blocks/nav-menu.php
index df890f7..b1f141f 100644
--- a/page-blocks/nav-menu.php
+++ b/page-blocks/nav-menu.php
@@ -3,8 +3,8 @@
 echo '<div class="dropdown">';
 echo '  <button onclick="myFunction()" class="dropbtn">Menu</button>';
 echo '  <div id="myDropdown" class="dropdown-content">';
-echo '    <a href="/">Home</a>';
+echo '    <a class="dropdown-first" href="/">Home</a>';
 echo '    <a href="/issue.php">Report Issue</a>';
-echo '    <a class="dropdown-last" href="/help.php">Help</a>';
+echo '    <a href="/help.php">Help</a>';
 echo '  </div>';
 echo '</div>';
diff --git a/php/version.php b/php/version.php
index db46dfd..a7af577 100644
--- a/php/version.php
+++ b/php/version.php
@@ -1,2 +1,2 @@
 <?php
-$athenaVersion = '0.4.1-alpha';
+$athenaVersion = '0.4.2-alpha';
diff --git a/styles/style.css b/styles/style.css
index 142a962..cf82c32 100644
--- a/styles/style.css
+++ b/styles/style.css
@@ -9,7 +9,7 @@ body {
 .titleimg {
   width: 80%;
   padding-top: 50px;
-  padding-bottom: 50px;
+  padding-bottom: 10px;
   max-width: 500px;
   transition: 0.2s;
 }
@@ -17,6 +17,7 @@ body {
 .lookup-box {
   text-align: center;
   border: black;
+  padding-top: 40px;
   border-radius: 40px;
   padding: 10px;
   margin-bottom: 5px;
@@ -117,7 +118,7 @@ body {
 
 /* START MENU STYLE */
 
-/* Dropdown Button */
+/* Menu Button */
 .dropbtn {
   position: fixed;
   top: 0;
@@ -126,12 +127,12 @@ body {
   color: white;
   padding: 12px;
   font-size: 12px;
+  box-shadow: 0px 4px 4px 0px rgba(0,0,0,0.2);
   border: none;
   border-bottom-left-radius: 10px;
   cursor: pointer;
 }
 
-/* Dropdown button on hover & focus */
 .dropbtn:hover, .dropbtn:focus {
   background-color: #0280e5;
 }
@@ -146,6 +147,9 @@ body {
 .dropdown-content {
   display: none;
   position: absolute;
+  top: -80px;
+  /*right: -190px;*/
+  left: 150px;
   background-color: #7fa7e6;
   min-width: 160px;
   box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
@@ -158,12 +162,12 @@ body {
   padding: 12px 16px;
   text-decoration: none;
   display: block;
-  border-top: 1px solid black;
+  border-bottom: 1px solid black;
 }
 
 /*Final item of the dropdown has bottom border*/
-.dropdown-last {
-  border-bottom: 1px solid black;
+.dropdown-first {
+  border-top: 1px solid black;
 }
 
 /* Change color of dropdown links on hover */
diff --git a/submit-done.php b/submit-done.php
index 4fbd78b..87b264c 100644
--- a/submit-done.php
+++ b/submit-done.php
@@ -23,13 +23,13 @@
         <p>You're helping to make Athena better for everyone.</p>
         <br>
         <br>
-        <p>You will be redirected to the homepage in five seconds.</p>
+        <p>You will be redirected to the homepage in three seconds.</p>
       </div>
 
       <script>
         setTimeout(function(){
           window.location.href = '/';
-        }, 5000);
+        }, 3000);
       </script>
 
     <!-- Footer -->