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

完善

Browse Source 
Former-commit-id: dd4c302e448f871376ab1298240b44aa3d3e1643 [formerly dd4c302e448f871376ab1298240b44aa3d3e1643 [formerly dd4c302e448f871376ab1298240b44aa3d3e1643 [formerly dd4c302e448f871376ab1298240b44aa3d3e1643 [formerly 8bbdd72ba63cd9161b2b2e51826b8813e8c9fffc [formerly e7d3090ad5a6f6801b32d0abce9a4e9291fcc0e7]]]]]
Former-commit-id: 1be4f8ac464528598b8a52649c107686d01c08d8
Former-commit-id: 7317640b0da3a039d8ca5b6457c1263fc1261272
Former-commit-id: 29d4f7df0be48866f4309a012d38e008e1725438 [formerly 9ee9681b4a3200cc3b344673e83d9f5e4343f07a]
Former-commit-id: fddc0694f8fbf921142069e11ff694ea218fa0d9
Former-commit-id: 92059d07f780aa09aaff77faf9bc41a8bd6269f0
Former-commit-id: aef5ddaf56545324913a9b425e7f8b7c3ed45518
Former-commit-id: 279be73fde5a48ddc78a258a2ea55a3b0d64fe2b
Former-commit-id: b970cb8f0bbe694a3bf733e726f8c833a1f3f511
This commit is contained in:
liyang
2018-07-17 14:33:33 +08:00
parent f67e14c3b9
commit 1ef066f47d
55 changed files with 2531 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/assets/style/theme/list.js
View File

@@ -2,28 +2,28 @@ export default [
{
title: 'd2admin 经典',
name: 'd2',
preview: 'theme/d2/preview@2x.png'
preview: 'image/theme/d2/preview@2x.png'
},
{
title: '紫罗兰',
name: 'violet',
preview: 'theme/violet/preview@2x.png'
preview: 'image/theme/violet/preview@2x.png'
},
{
title: '简约线条',
name: 'line',
backgroundImage: 'theme/line/bg.jpg',
preview: 'theme/line/preview@2x.png'
backgroundImage: 'image/theme/line/bg.jpg',
preview: 'image/theme/line/preview@2x.png'
},
{
title: '流星',
name: 'star',
backgroundImage: 'theme/star/bg.jpg',
preview: 'theme/star/preview@2x.png'
backgroundImage: 'image/theme/star/bg.jpg',
preview: 'image/theme/star/preview@2x.png'
},
{
title: 'Tomorrow Night Blue (vsCode)',
name: 'tomorrow-night-blue',
preview: 'theme/tomorrow-night-blue/preview@2x.png'
preview: 'image/theme/tomorrow-night-blue/preview@2x.png'
}
]

13
src/assets/style/theme/theme-base.scss
View File

@@ -146,6 +146,11 @@
.d2-theme-container {
// 侧边栏
.d2-theme-container-aside {
%d2-theme-container-aside-menu-icon {
width: 20px;
text-align: center;
font-size: 16px;
}
// [菜单] 正常状态
.el-menu {
@extend %unable-select;
@@ -153,9 +158,7 @@
border-right: none;
.el-menu-item {
i {
margin-left: 4px;
margin-right: 5px;
font-size: 16px;
@extend %d2-theme-container-aside-menu-icon;
}
}
}
@@ -163,9 +166,7 @@
@extend %unable-select;
.el-submenu__title {
i {
margin-left: 4px;
margin-right: 5px;
font-size: 16px;
@extend %d2-theme-container-aside-menu-icon;
}
.el-submenu__icon-arrow {
margin-top: -10px;

4
src/components/core/d2-layout-main/index.vue
View File

@@ -10,8 +10,8 @@
<!-- 顶栏 -->
<div class="d2-theme-header">
<div class="logo-group" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
<img v-if="collapse" :src="`${$baseUrl}/theme/${themeActiveSetting.name}/logo/icon-only.png`">
<img v-else :src="`${$baseUrl}/theme/${themeActiveSetting.name}/logo/all.png`">
<img v-if="collapse" :src="`${$baseUrl}image/theme/${themeActiveSetting.name}/logo/icon-only.png`">
<img v-else :src="`${$baseUrl}image/theme/${themeActiveSetting.name}/logo/all.png`">
</div>
<div class="toggle-aside-btn" @click="collapse = !collapse">
<d2-icon name="bars"/>

2
src/views/demo/components/icon/components/d2-icon-cell.vue
View File

@@ -31,7 +31,7 @@
<el-tag type="info">
<i :class="'fa fa-' + icon"></i>
</el-tag>
<span style="font-size: 10px;">{{icon}}</span>
<span style="font-size: 10px; margin-left: 5px;">{{icon}}</span>
</span>
</div>
</template>

12
src/views/demo/components/icon/icon.vue
View File

@@ -1,16 +1,16 @@
<template>
<d2-container>
<template slot="header">图标组件</template>
<d2-icon/>
<d2-icon name="github"/>
<d2-icon name="github" style="font-size: 100px;"/>
<d2-icon name="github" class="icon-class-demo"/>
<d2-icon class="d2-mr-10"/>
<d2-icon name="github" class="d2-mr-10"/>
<d2-icon name="github" style="font-size: 100px;" class="d2-mr-10"/>
<d2-icon name="github" class="icon-demo"/>
</d2-container>
</template>
<style lang="scss">
<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.icon-class-demo {
.icon-demo {
transition: all .3s;
font-size: 100px;
color: #409EFF;