Merge branch 'web'

kaifain_v2/components/Pagination.vue

@@ -5,7 +5,7 @@
       v-model="page"
       :total="total"
       :per-page="perPage"
-      :range-before="5"
+      :range-before="3"
       :range-after="5"
       order="is-centered"
       aria-next-label="下一页"
@@ -119,7 +119,7 @@ export default Vue.extend({
   }
 
   .pagination {
-    max-width: 640px;
+    max-width: 720px;
     margin: 0 auto;
     justify-content: center;
     padding: 3rem 0;

kaifain_v2/components/SearchBox.vue

@@ -78,6 +78,7 @@ export default Vue.extend({
       padding-left: 1.5rem;
       padding-right: 1.5rem;
       border-radius: 4px 0 0 4px;
+      margin: 0;
     }
 
     .button {

kaifain_v2/components/Topnav.vue

@@ -184,6 +184,7 @@ $theme-color: #20242d;
     .button.is-small {
       border-radius: 0 4px 4px 0;
       font-weight: 500;
+      border: 0;
     }
   }
 

kaifain_v2/pages/index.vue

@@ -221,7 +221,6 @@ export default SolutionListMixin.extend({
   .home {
     .main {
       min-height: 480px;
-      margin: 0;
     }
   }
 }

kaifain_v2/pages/search.vue

@@ -165,7 +165,6 @@ export default SolutionListMixin.extend({
     .main {
       padding-top: 54px;
       min-height: 720px;
-      margin: 0;
     }
 
     .hits-msg {

layouts/kaifain_v2.vue

@@ -64,6 +64,12 @@ export default {
     }
   }
 
+  .main {
+    min-width: auto;
+    min-height: auto;
+    margin: 0;
+  }
+
   .footer {
     padding: 0 0 1rem;
   }