Merge pull request #71 from terwer/v4.x

Fix align
terwer · Mar 24, 2019 · 6cd88d9 · 6cd88d9
2 parents 0f1746f + 7013e8d
commit 6cd88d9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/jvue-front/components/themes/dark/Aside.vue b/jvue-front/components/themes/dark/Aside.vue
@@ -15,15 +15,21 @@
               <nuxt-link
                 class="aside-link-dark"
                 :to="
-                  post.name === ''
+                  post.name === '' || post.name === 'null' || post.name === null
                     ? '/post-dark/' + post.id + '.html'
                     : '/post-dark/' + post.name + '.html'
                 "
               >
                 <h2
                   :class="post.thumbnails.length > 0 ? 'has-image-title' : ''"
                 >
-                  {{ post.title === "" ? "暂无标题" : post.title }}
+                  {{
+                    post.title === ""
+                      ? "暂无标题"
+                      : post.title.length > 20
+                      ? post.title.substring(0, 20)
+                      : post.title
+                  }}
                 </h2>
               </nuxt-link>
             </div>
@@ -66,7 +72,7 @@ export default {
   background-color: #212121;
 }
 .has-image-title {
-  margin-top: 15px;
+  margin: 0;
 }
 h2 {
   color: #c792ea;

diff --git a/jvue-front/components/themes/dark/PostList.vue b/jvue-front/components/themes/dark/PostList.vue
@@ -42,7 +42,7 @@
               <div class="time">发布于 {{ post.created }}</div>
               <nuxt-link
                 :to="
-                  post.name === ''
+                  post.name === '' || post.name === 'null' || post.name === null
                     ? '/post-dark/' + post.id + '.html'
                     : '/post-dark/' + post.name + '.html'
                 "

diff --git a/jvue-front/components/themes/default/Aside.vue b/jvue-front/components/themes/default/Aside.vue
@@ -15,15 +15,21 @@
               <nuxt-link
                 class="aside-link"
                 :to="
-                  post.name === ''
+                  post.name === '' || post.name === 'null' || post.name === null
                     ? '/post/' + post.id + '.html'
                     : '/post/' + post.name + '.html'
                 "
               >
                 <h2
                   :class="post.thumbnails.length > 0 ? 'has-image-title' : ''"
                 >
-                  {{ post.title === "" ? "暂无标题" : post.title }}
+                  {{
+                    post.title === ""
+                      ? "暂无标题"
+                      : post.title.length > 20
+                      ? post.title.substring(0, 20)
+                      : post.title
+                  }}
                 </h2>
               </nuxt-link>
             </div>
@@ -59,6 +65,6 @@ export default {
 
 <style scoped>
 .has-image-title {
-  margin-top: 15px;
+  margin: 0;
 }
 </style>
diff --git a/jvue-front/components/themes/default/PostList.vue b/jvue-front/components/themes/default/PostList.vue
@@ -42,7 +42,7 @@
               <div class="time">发布于 {{ post.created }}</div>
               <nuxt-link
                 :to="
-                  post.name === ''
+                  post.name === '' || post.name === 'null' || post.name === null
                     ? '/post/' + post.id + '.html'
                     : '/post/' + post.name + '.html'
                 "