From 0496faa586224dff0a93ba4abcaeafab6df83aa2 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期五, 26 十一月 2021 10:19:18 +0800
Subject: [PATCH] fix: TODO#130846 各內頁加上 navbar (web 跑版)
---
PAMapp/components/BackActionBar.vue | 8 +++++++-
PAMapp/layouts/default.vue | 30 +++++++++++++++++-------------
2 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/PAMapp/components/BackActionBar.vue b/PAMapp/components/BackActionBar.vue
index 364b406..c3aef12 100644
--- a/PAMapp/components/BackActionBar.vue
+++ b/PAMapp/components/BackActionBar.vue
@@ -61,7 +61,7 @@
display: flex;
align-items: center;
position: fixed;
- top: 52px;
+ top: $MOB_NAV_BAR;
left: 0;
width: 100%;
background-color: $PRIMARY_WHITE;
@@ -77,4 +77,10 @@
padding: 20px;
}
}
+
+@include desktop {
+ .pam-back-action-bar {
+ top: $DESKTOP_NAV_BAR;
+ }
+}
</style>
diff --git a/PAMapp/layouts/default.vue b/PAMapp/layouts/default.vue
index e22d39b..c0c6125 100644
--- a/PAMapp/layouts/default.vue
+++ b/PAMapp/layouts/default.vue
@@ -92,18 +92,6 @@
margin: 30px 20px;
}
- @include desktop {
- .pam-page-container {
- width: 700px;
- margin: 30px auto 0px auto;
- }
- .pam-banner__text{
- width: 700px;
- position: static !important;
- margin: 30px auto 0px auto;
- }
- }
-
.pam-banner {
width: 100%;
height: 120px;
@@ -115,9 +103,25 @@
}
.mt-navBar {
- margin-top: 105px;
+ margin-top: calc($MOB_NAV_BAR * 2);
}
+ @include desktop {
+ .mt-navBar {
+ margin-top: calc($DESKTOP_NAV_BAR + $MOB_NAV_BAR);
+ }
+ .pam-page-container {
+ width: 700px;
+ margin: 30px auto 0px auto;
+ }
+ .pam-banner__text{
+ width: 700px;
+ position: static !important;
+ margin: 30px auto 0px auto;
+ }
+ }
+
+
.pam-banner__text {
font-size: 18px;
--
Gitblit v1.8.0