Merge branch 'i18n' into deploy

This commit is contained in:
Pan
2019-05-09 12:47:59 +08:00
7 changed files with 15 additions and 4 deletions

View File

@@ -38,7 +38,7 @@ export default {
</script>
<style lang="scss" >
$n: 8; //和items.length 相同
$n: 9; //和items.length 相同
$t: .1s;
.share-dropdown-menu {
width: 250px;

View File

@@ -49,3 +49,11 @@ export default {
}
</style>
<style lang="scss">
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
.fixed-header {
padding-right: 15px;
}
}
</style>

View File

@@ -149,6 +149,7 @@ export default {
{ title: '登录权限篇', href: 'https://juejin.im/post/591aa14f570c35006961acac' },
{ title: '实战篇', href: 'https://juejin.im/post/593121aa0ce4630057f70d35' },
{ title: 'vue-admin-template 篇', href: 'https://juejin.im/post/595b4d776fb9a06bbe7dba56' },
{ title: 'v4.0 篇', href: 'https://juejin.im/post/5c92ff94f265da6128275a85' },
{ title: '优雅的使用 icon', href: 'https://juejin.im/post/59bb864b5188257e7a427c09' }
]
}

View File

@@ -19,6 +19,7 @@ export default {
{ title: '登录权限篇', href: 'https://juejin.im/post/591aa14f570c35006961acac' },
{ title: '实战篇', href: 'https://juejin.im/post/593121aa0ce4630057f70d35' },
{ title: 'vue-admin-template 篇', href: 'https://juejin.im/post/595b4d776fb9a06bbe7dba56' },
{ title: 'v4.0 篇', href: 'https://juejin.im/post/5c92ff94f265da6128275a85' },
{ title: '自行封装 component', href: 'https://segmentfault.com/a/1190000009090836' },
{ title: '优雅的使用 icon', href: 'https://juejin.im/post/59bb864b5188257e7a427c09' },
{ title: 'webpack4', href: 'https://juejin.im/post/59bb864b5188257e7a427c09' },

View File

@@ -1,5 +1,5 @@
<template>
<el-card>
<el-card style="margin-bottom:20px;">
<div slot="header" class="clearfix">
<span>About me</span>
</div>

View File

@@ -3,11 +3,11 @@
<div v-if="user">
<el-row :gutter="20">
<el-col :span="6">
<el-col :span="6" :xs="24">
<user-card :user="user" />
</el-col>
<el-col :span="18">
<el-col :span="18" :xs="24">
<el-card>
<el-tabs v-model="activeTab">
<el-tab-pane label="Activity" name="activity">