From 321b74b5ca068438dd577a617ed7399aea68b45e Mon Sep 17 00:00:00 2001 From: lunarkid Date: Sat, 18 Feb 2023 10:33:05 +0700 Subject: [PATCH] fix: header footer not sticky --- web/css/reskin-or/reskin.css | 37 +++------- web/jsp/viewProjectDetails.jsp | 86 ++++++++++++++++-------- web/jsp/viewProjectManagementConsole.jsp | 5 +- web/jsp/viewProjectPayments.jsp | 2 +- 4 files changed, 72 insertions(+), 58 deletions(-) diff --git a/web/css/reskin-or/reskin.css b/web/css/reskin-or/reskin.css index 761057e9fb..fd3af438ae 100644 --- a/web/css/reskin-or/reskin.css +++ b/web/css/reskin-or/reskin.css @@ -138,12 +138,15 @@ body { text-decoration: none !important; } +.mainFooter { + position: sticky; + bottom: calc(-1 * var(--footer-height)); + z-index: 99; +} + .mainTabs { width: 100%; background-color: var(--black-10); - position: fixed; - top: var(--header-height); - z-index: 998; font-family: Barlow, sans-serif; text-transform: uppercase; font-weight: 600; @@ -182,20 +185,18 @@ body { .content { margin: 0; - padding-bottom: 90px; - padding-top: 116px; - min-height: 100vh; + min-height: calc(100vh - var(--header-height) - var(--footer-height) - 56px); } .content--manageProject, .content--projectDetails { - padding-bottom: 200px; + /* padding-bottom: 200px; */ } .content--viewSpec, .content--viewApproval, .content--projectPayment { - padding-bottom: 135px; + /* padding-bottom: 135px; */ } .content__inner { @@ -829,11 +830,8 @@ table.scorecard td.reviewerResp input { } .cta { - position: fixed; width: 100%; background-color: #fff; - bottom: var(--footer-height); - z-index: 99; box-shadow: 0 0 16px 16px rgb(42 42 42 / 10%); } @@ -2572,11 +2570,6 @@ td.resourcesTable__empty { height: 74px; } -.viewManageButtom { - position: absolute; - right: 0; -} - .editProject__checkbox .when { margin-left: 8px; order: 1; @@ -2649,18 +2642,11 @@ td.resourcesTable__empty { } #headerNav { - position: fixed; width: 100%; - z-index: 999; - top: 0; } #footerNav { - position: fixed; width: 100%; - z-index: 99; - bottom: 0; - left: 0; } .checkPoint__chevron { @@ -2758,9 +2744,6 @@ td.resourcesTable__empty { height: 35px; } -.ctaOpen { - bottom: 386px !important; -} .approvalRadioBtn { display: flex; align-items: flex-start; @@ -2781,4 +2764,4 @@ td.resourcesTable__empty { .lateness { width: 110px; -} \ No newline at end of file +} diff --git a/web/jsp/viewProjectDetails.jsp b/web/jsp/viewProjectDetails.jsp index ceeb1dc016..f41c02f859 100644 --- a/web/jsp/viewProjectDetails.jsp +++ b/web/jsp/viewProjectDetails.jsp @@ -171,39 +171,69 @@ -
-
- - - - - - - - - - - - +
+
+
+ + + + + + + + + + + + +
+
- diff --git a/web/jsp/viewProjectManagementConsole.jsp b/web/jsp/viewProjectManagementConsole.jsp index 5c08547b81..e469a2c32a 100644 --- a/web/jsp/viewProjectManagementConsole.jsp +++ b/web/jsp/viewProjectManagementConsole.jsp @@ -284,7 +284,7 @@ -
+
@@ -874,7 +874,7 @@
-
+
@@ -887,6 +887,7 @@
+ diff --git a/web/jsp/viewProjectPayments.jsp b/web/jsp/viewProjectPayments.jsp index 2cb5592d65..e5a4c4390b 100644 --- a/web/jsp/viewProjectPayments.jsp +++ b/web/jsp/viewProjectPayments.jsp @@ -143,7 +143,7 @@ -
+