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/layouts/default.vue | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/PAMapp/layouts/default.vue b/PAMapp/layouts/default.vue
index 1c15771..c0c6125 100644
--- a/PAMapp/layouts/default.vue
+++ b/PAMapp/layouts/default.vue
@@ -1,6 +1,7 @@
<template>
<div class="pam-background">
<UiGoToTop></UiGoToTop>
+ <NavBar></NavBar>
<BackActionBar></BackActionBar>
<div class="pam-banner"
:class="bannerClassName">
@@ -12,7 +13,10 @@
</div>
</div>
</div>
- <div class="pam-container" :class="containClassName">
+ <div
+ class="pam-container"
+ :class="[containClassName,{'mt-navBar': bannerClassName === 'pam-no-banner'}]"
+ >
<Nuxt class="pam-page-container"></Nuxt>
</div>
<Footer></Footer>
@@ -88,7 +92,24 @@
margin: 30px 20px;
}
+ .pam-banner {
+ width: 100%;
+ height: 120px;
+ background-size: cover;
+ background-repeat: no-repeat;
+ background-position: center;
+ position: relative;
+ @extend .mt-navBar;
+ }
+
+ .mt-navBar {
+ 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;
@@ -100,14 +121,7 @@
}
}
- .pam-banner {
- width: 100%;
- height: 120px;
- background-size: cover;
- background-repeat: no-repeat;
- background-position: center;
- position: relative;
- }
+
.pam-banner__text {
font-size: 18px;
--
Gitblit v1.8.0