浏览代码

Merge branch 'hotfix/blog' into develop

zhixin 6 年之前
父节点
当前提交
1ff7459302
共有 2 个文件被更改,包括 15 次插入3 次删除
  1. 8 1
      site/_includes/docs-navbar.html
  2. 7 2
      site/docs/vuejs/webpack.md

+ 8 - 1
site/_includes/docs-navbar.html

@@ -31,7 +31,6 @@
           href="https://live.bootstrap-table.com"
           target="_blank">
           Online Editor
-          <span class="badge badge-warning">New</span>
         </a>
       </li>
       <li class="nav-item {% if page.title == "Donate" %}active{% endif %}">
@@ -44,6 +43,14 @@
           News
         </a>
       </li>
+      <li class="nav-item">
+        <a class="nav-link"
+          href="https://blog.bootstrap-table.com"
+          target="_blank">
+          Blog
+          <span class="badge badge-warning">New</span>
+        </a>
+      </li>
     </ul>
   </div>
 

+ 7 - 2
site/docs/vuejs/webpack.md

@@ -52,7 +52,11 @@ import 'bootstrap-table/dist/extensions/fixed-columns/bootstrap-table-fixed-colu
 
 {% highlight vue %}
 <template>
-  <BootstrapTable :columns="columns" :data="data" :options="options"></BootstrapTable>
+  <BootstrapTable
+    :columns="columns"
+    :data="data"
+    :options="options"
+  />
 </template>
 
 <script>
@@ -72,7 +76,8 @@ export default {
         {
           field: 'name',
           title: 'Item Name'
-        }, {
+        },
+        {
           field: 'price',
           title: 'Item Price'
         }