fix: pager

Renovamen · Feb 7, 2021 · 0435bf6 · 0435bf6 · vercel · Feb 7, 2021
1 parent 00a1850
commit 0435bf6
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 26 deletions.
diff --git a/packages/theme-gungnir/components/Common.vue b/packages/theme-gungnir/components/Common.vue
@@ -205,7 +205,7 @@ export default {
     width 100vw
     height 100vh
     display none
-    background-color rgba(0, 0, 0, .65)
+    background-color rgba(0, 0, 0, .55)
   .sidebar
     .mobile-hero-avatar
       margin 0 auto

diff --git a/packages/theme-gungnir/components/Page.vue b/packages/theme-gungnir/components/Page.vue
@@ -104,7 +104,6 @@ export default {
   },
 
   mounted() {
-    console.log(this.$page.readingTime)
     this.codeFullScreen()
   },
   methods: {

diff --git a/packages/theme-gungnir/components/Pager.vue b/packages/theme-gungnir/components/Pager.vue
@@ -1,15 +1,5 @@
 <template>
   <div class="pager">
-    <router-link
-      v-if="data.prev"
-      class="previous"
-      :to="data.prev.link"
-    >
-      {{ data.prev.text }}<br>
-      <span v-if="data.prev.subtext">
-        {{ data.prev.subtext }}
-      </span>
-    </router-link>
     <router-link
       v-if="data.next"
       class="next"
@@ -20,6 +10,16 @@
         {{ data.next.subtext }}
       </span>
     </router-link>
+    <router-link
+      v-if="data.prev"
+      class="previous"
+      :to="data.prev.link"
+    >
+      {{ data.prev.text }}<br>
+      <span v-if="data.prev.subtext">
+        {{ data.prev.subtext }}
+      </span>
+    </router-link>
   </div>
 </template>
 
@@ -55,9 +55,9 @@ export default {
     letter-spacing 1px
     color var(--text-color)
     &.next
-      float right
-    &.previous
       float left
+    &.previous
+      float right
     span
       font-weight normal
       color var(--text-color-sub)

diff --git a/packages/theme-gungnir/components/PostList.vue b/packages/theme-gungnir/components/PostList.vue
@@ -30,14 +30,14 @@ export default {
     getPagerData () {
       var pagerData = {}
       if(this.$pagination.hasPrev) {
-        pagerData.prev = {}
-        pagerData.prev.text = this.$themeLocales.homePrev
-        pagerData.prev.link = this.$pagination.prevLink
+        pagerData.next = {}
+        pagerData.next.text = this.$themeLocales.homePrev
+        pagerData.next.link = this.$pagination.prevLink
       }
       if(this.$pagination.hasNext) {
-        pagerData.next = {}
-        pagerData.next.text = this.$themeLocales.homeNext
-        pagerData.next.link = this.$pagination.nextLink
+        pagerData.prev = {}
+        pagerData.prev.text = this.$themeLocales.homeNext
+        pagerData.prev.link = this.$pagination.nextLink
       }
       return pagerData
     }

diff --git a/packages/theme-gungnir/layouts/Post.vue b/packages/theme-gungnir/layouts/Post.vue
@@ -41,7 +41,6 @@ export default {
   },
   data () {
     return {
-      navHeight: 0,
       isFixed: false,
       catalogTop: 0,
       screenWidth: 0
@@ -63,7 +62,6 @@ export default {
     }
   },
   mounted () {
-    this.navHeight = this.$children[0].$children[0].$refs.navbar.offsetHeight
     this.headerHeight = document.querySelector('.post-header').offsetHeight
     this.screenWidth = document.body.clientWidth
     if (this.screenWidth <= 719) this.catalogTop = -15  // $MQMobile

diff --git a/packages/theme-gungnir/locales/en-US.js b/packages/theme-gungnir/locales/en-US.js
@@ -16,8 +16,8 @@ export default {
   // post meta
   lastUpdated: 'Last Updated',
   editLinkText: 'Edit this page on GitHub',
-  postPrev: 'Next',
-  postNext: 'Previous',
+  postNext: 'Next',
+  postPrev: 'Previous',
 
   // home page pager
   homePrev: '← Newer Posts',

diff --git a/packages/theme-gungnir/locales/zh-CN.js b/packages/theme-gungnir/locales/zh-CN.js
@@ -16,8 +16,8 @@ export default {
   // post meta
   lastUpdated: '上次编辑于',
   editLinkText: '在 GitHub 上编辑此页',
-  postPrev: '下一篇',
-  postNext: '上一篇',
+  postNext: '下一篇',
+  postPrev: '上一篇',
 
   // home page pager
   homePrev: '← 较新的文章',