From 04900313cb2e34b919dfe792d93876c871cfe558 Mon Sep 17 00:00:00 2001 From: Eirik Th S Date: Tue, 15 Jun 2021 11:22:33 +0200 Subject: [PATCH] Fixed forgotten "Groceries" name and added footer --- www/css/index.css | 25 +++++++++++++++++++- www/index.php | 47 ++++++++++++++++++++----------------- www/login.php | 22 +++++++++-------- www/plan/index.php | 52 ++++++++++++++++++++++------------------- www/register.php | 12 ++++++---- www/webdata/footer.html | 7 ++++++ 6 files changed, 105 insertions(+), 60 deletions(-) create mode 100644 www/webdata/footer.html diff --git a/www/css/index.css b/www/css/index.css index e3c9e4d..2a01e48 100644 --- a/www/css/index.css +++ b/www/css/index.css @@ -4,6 +4,7 @@ --wsTop: env(safe-area-inset-top); --wsBottom: constant(safe-area-inset-bottom); --wsBottom: env(safe-area-inset-bottom); + --footerHeight: 51px; } html { @@ -172,4 +173,26 @@ body.dollars span.price::after { border-radius: 30px; font-weight: bold; } -/*}*/ \ No newline at end of file +/*}*/ + +#page-container { /** body ? **/ + position: relative; + min-height: 100vh; +} + +#page-wrapper { + padding-bottom: var(--footerHeight); +} + +footer { + position: absolute; + bottom: 0; + width: 100%; + height: var(--footerHeight); + max-height: var(--footerHeight); + overflow: hidden; + + text-align: center; + background: #fffd; + padding: 15px 10px calc(var(--wsBottom) + 15px); +} diff --git a/www/index.php b/www/index.php index 82195c7..3270ff9 100644 --- a/www/index.php +++ b/www/index.php @@ -5,35 +5,40 @@ PaperBag - Plan & Execute Your Shopping - - - -

PaperBag

-
+
+
-
+ -
- - -
-
Plan shopping
-

+

PaperBag

+
+ +
+ +
+ + +
+
Plan shopping
+

+
+ +
+ +
+ +
+
Review
+

Coming soon

+
- -
-
- -
-
Review
-

Coming soon

+
- -
+
\ No newline at end of file diff --git a/www/login.php b/www/login.php index 99077ef..5ac6d15 100644 --- a/www/login.php +++ b/www/login.php @@ -54,6 +54,8 @@ if(isset($_POST) && !empty($_POST)){ Login - PaperBag +
+
@@ -74,30 +76,30 @@ if(isset($_POST) && !empty($_POST)){
-
- +
+
- +
- +
- +
-
+
-
- -
+

Do you not have an account? Register

- +
+ +
\ No newline at end of file diff --git a/www/plan/index.php b/www/plan/index.php index 160a383..e3f72ab 100644 --- a/www/plan/index.php +++ b/www/plan/index.php @@ -5,33 +5,37 @@ Plan - PaperBag - Plan Your Shopping - -

Grocery Assist

-
+
+
+ +

PaperBag

+
+ +
+
+ + +
+
+ +
+
+
Please enable javascript for this page to work
+
+
+ +
Space subtotal: 239.00
+
+

+ -
-
- -
+ +
- -
-
-
Please enable javascript for this page to work
-
-
- -
Space subtotal: 239.00
-
-

- - +
- - - \ No newline at end of file diff --git a/www/register.php b/www/register.php index 03c5e3e..23431ab 100644 --- a/www/register.php +++ b/www/register.php @@ -68,6 +68,8 @@ if(isset($_POST) && !empty($_POST)) { Register - PaperBag +
+
@@ -97,7 +99,7 @@ if(isset($_POST) && !empty($_POST)) {
-
+
-
- +
+

Already have an account? Login

- +
+ +
\ No newline at end of file diff --git a/www/webdata/footer.html b/www/webdata/footer.html new file mode 100644 index 0000000..fa8cd4f --- /dev/null +++ b/www/webdata/footer.html @@ -0,0 +1,7 @@ + \ No newline at end of file