sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source 
Former-commit-id: dc00ba8447346bdb50d6db4c2e502e0417716be5 [formerly dc00ba8447346bdb50d6db4c2e502e0417716be5 [formerly dc00ba8447346bdb50d6db4c2e502e0417716be5 [formerly dc00ba8447346bdb50d6db4c2e502e0417716be5 [formerly d70c4aacac14785985340f459049bfb33b8dd0da [formerly cfee17cff05b0be09a69e82547583cebf7d06f72]]]]]
Former-commit-id: e39442b5d8f3bee965c7ec6ea0b2e5af114e12c0
Former-commit-id: d8ae3507ed96b71f3a936bea3612573ae708825f
Former-commit-id: 92cefcc3cbb85872210791eb22e76947a6cee00f [formerly a92fc587b86bbc55ed8a7319d476b00aa749331c]
Former-commit-id: eaf19c7e4bff34ef54bde81124e282a56e93c3cd
Former-commit-id: 5258259f5b3edccc76ec01cd5115adc113a1d2fc
Former-commit-id: 3cb6b521ea9415b0754a951670021c1be1235154
Former-commit-id: 94f6ffc62172d1e5ed89d5521fd0329f82e43be9
Former-commit-id: 0c5f7b6efe0c48e429cdccc5915a9d65519a4d17
This commit is contained in:
liyang
2018-09-08 21:04:06 +08:00
parent c4a0b31214 a86b73ddee
commit d1c457010b
4 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -2,7 +2,7 @@
<p align="center">
<a><img src="https://img.shields.io/github/release/d2-projects/d2-admin.svg"/></a>
<a><img src="https://badge.fury.io/js/%40d2-admin%2Fice-scaffold.svg"/></a>
<a><img src="https://img.shields.io/npm/v/@d2-admin/ice-scaffold.svg"/></a>
<a href="https://www.travis-ci.org/d2-projects/d2-admin"><img src="https://www.travis-ci.org/d2-projects/d2-admin.svg?branch=master"/></a>
<a><img src="https://img.shields.io/github/last-commit/d2-projects/d2-admin.svg"/></a>
<a><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg"/></a>

2
doc/CH.md
View File

@@ -2,7 +2,7 @@
<p align="center">
<a><img src="https://img.shields.io/github/release/d2-projects/d2-admin.svg"/></a>
<a><img src="https://badge.fury.io/js/%40d2-admin%2Fice-scaffold.svg"/></a>
<a><img src="https://img.shields.io/npm/v/@d2-admin/ice-scaffold.svg"/></a>
<a href="https://www.travis-ci.org/d2-projects/d2-admin"><img src="https://www.travis-ci.org/d2-projects/d2-admin.svg?branch=master"/></a>
<a><img src="https://img.shields.io/github/last-commit/d2-projects/d2-admin.svg"/></a>
<a><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg"/></a>

36
src/pages/index/components/d2-badge/index.vue Normal file
View File

@@ -0,0 +1,36 @@
<template>
<div class="d2-badge">
<p align="center">
<a><img src="https://img.shields.io/github/release/d2-projects/d2-admin.svg"/></a>
<a><img src="https://img.shields.io/github/forks/d2-projects/d2-admin.svg"/></a>
<a><img src="https://img.shields.io/github/stars/d2-projects/d2-admin.svg"/></a>
<a><img src="https://img.shields.io/github/issues/d2-projects/d2-admin.svg"/></a>
<a><img src="https://img.shields.io/github/issues-closed/d2-projects/d2-admin.svg"/></a>
<a><img src="https://img.shields.io/github/issues-pr/d2-projects/d2-admin.svg"/></a>
<a><img src="https://img.shields.io/github/issues-pr-closed/d2-projects/d2-admin.svg"/></a>
</p>
<p align="center">
<a><img src="https://img.shields.io/npm/v/@d2-admin/ice-scaffold.svg"/></a>
<a href="https://www.travis-ci.org/d2-projects/d2-admin"><img src="https://www.travis-ci.org/d2-projects/d2-admin.svg?branch=master"/></a>
<a><img src="https://img.shields.io/github/last-commit/d2-projects/d2-admin.svg"/></a>
<a><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg"/></a>
</p>
</div>
</template>
<style lang="scss" scoped>
.d2-badge {
margin-bottom: 20px;
p {
margin: 0px;
margin-bottom: 2px;
:nth-last-child() {
margin-bottom: 0px;
}
a {
display: inline-block;
margin: 0px 2px;
}
}
}
</style>

9
src/pages/index/page.vue
View File

@@ -27,7 +27,8 @@
</p>
</el-popover>
</div>
<d2-help-btn class="d2-mt"/>
<d2-badge/>
<d2-help-btn/>
</template>
</d2-page-cover>
</d2-container>
@@ -35,9 +36,11 @@
<script>
import D2HelpBtn from './components/d2-help-btn'
import D2Badge from './components/d2-badge'
export default {
components: {
D2HelpBtn
D2HelpBtn,
D2Badge
}
}
</script>
@@ -48,6 +51,8 @@ export default {
.page__btn-group {
color: $color-text-placehoder;
font-size: 12px;
margin-top: -10px;
margin-bottom: 20px;
span {
color: $color-text-sub;
&:hover {