Merge pull request #26 from ShanghaitechGeekPie/master

Fix Banner in Mobile Device and Add New Contributor
ShanghaitechGeekPie · Jul 2, 2024 · 9c5778c · 9c5778c
2 parents 1626fbc + f36de4f
commit 9c5778c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -10,6 +10,7 @@
         <ActivityBanner :Enable="true">
           评论拿赏金功能上线啦！详情请点击<a
             @click="$router.push('/activities')"
+            class="inline-link"
             >这里</a
           >！
         </ActivityBanner>
@@ -113,4 +114,11 @@ export default {
 body {
   overflow-x: hidden;
 }
+.inline-link {
+  color: #0067bf;
+  cursor: pointer;
+  text-decoration: none;
+  white-space: nowrap;
+  text-decoration: underline;
+}
 </style>
diff --git a/src/assets/contributors.json b/src/assets/contributors.json
@@ -77,6 +77,18 @@
     "avatar": "qq:2653292820",
     "role": "Backend Developer"
   },
+  {
+    "name": "Butterfly",
+    "home": "qq:2561631802",
+    "avatar": "github:140795018",
+    "role": "Backend Developer"
+  },
+  {
+    "name": "Prince213",
+    "home": "github:Prince213",
+    "avatar": "github:25235514",
+    "role": "Backend Developer"
+  },
   {
     "name": "邓宸希",
     "home": "qq:3260984912",
@@ -112,5 +124,11 @@
     "home": "homepage:https://masodong.notion.site/Mason-Dong-bf0c99969ed046ecab3d101000b35522",
     "avatar": "qq:2311470535",
     "role": "UI/UX Designer"
+  },
+  {
+    "name": "王九墨",
+    "home": "qq:2140568350",
+    "avatar": "qq:2140568350",
+    "role": "UI/UX Designer"
   }
 ]
diff --git a/src/components/global/ActivityBanner.vue b/src/components/global/ActivityBanner.vue
@@ -5,6 +5,7 @@
       'background-color': $vuetify.theme.dark ? '#2a4165' : '#e8f0fe',
     }"
     v-if="Enable"
+    style="z-index: 2;"
   >
     <div class="d-flex justify-center flex-column">
       <div class="text-body-1 primary--text">

diff --git a/src/components/global/MenuSideBar.vue b/src/components/global/MenuSideBar.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-navigation-drawer v-model="menuBarStatus.drawer" absolute>
+  <v-navigation-drawer v-model="menuBarStatus.drawer" fixed>
     <v-list nav dense>
       <v-list-item-group
         v-model="model"
@@ -26,7 +26,7 @@
             最近评价
           </v-list-item-title>
         </v-list-item>
-        <v-list-item to="/ranking" v-if="$vuetify.breakpoint.smAndDown">
+        <v-list-item to="/ranking" v-if="$vuetify.breakpoint.lgAndDown">
           <v-list-item-title
             plain
             tile

diff --git a/src/composables/global/useMenuBar.js b/src/composables/global/useMenuBar.js
@@ -14,7 +14,7 @@ export default () => {
 
   const updateMenuStatus = () => {
     menuBarStatus.drawer =
-      window.innerWidth >= 960 ? false : menuBarStatus.drawer;
+      window.innerWidth >= 600 ? false : menuBarStatus.drawer;
   };
 
   return { menuBarStatus };