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

no message

Browse Source 
Former-commit-id: 60df53b3063a32c158cd85da6ed5e52de8bdfb5c
Former-commit-id: 879b47493917f6ed81011a7c37fc0bc2214bb861
Former-commit-id: 42b10c5622699003ced22170db334fafe03e1938
This commit is contained in:
liyang
2018-06-10 21:42:41 +08:00
parent 97625537fd
commit 2cacbbe134
5 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/assets/style/theme/star/index.scss
View File

@@ -83,10 +83,8 @@ $theme-container-full-border-color: #d8dfea;
.d2-header-right { .d2-header-right {
.btn-text { .btn-text {
color: #FFF; color: #FFF;
} &:hover {
.el-dropdown { background-color: rgba(#FFF, .1);
.el-dropdown-link {
color: #FFF;
} }
} }
} }

9
src/assets/style/theme/theme.scss
View File

@@ -51,6 +51,15 @@
height: 60px; height: 60px;
display: flex; display: flex;
align-items: center; align-items: center;
.btn-text {
padding: 14px 12px;
border-radius: 4px;
margin: 0px !important;
margin-right: 10px !important;
&:last-child {
margin-right: 0px !important;
}
}
.el-dropdown { .el-dropdown {
user-select: none; user-select: none;
cursor: pointer; cursor: pointer;

17
src/components/core/d2-layout-main/components/-header-right/components/-theme.vue
View File

@@ -1,10 +1,11 @@
<template> <template>
<el-dropdown class="d2-mr"> <el-tooltip
<span class="el-dropdown-link">主题</span> class="item"
<el-dropdown-menu slot="dropdown"> effect="dark"
<el-dropdown-item> content="theme"
<div style="height: 200px; width: 200px;"></div> placement="bottom">
</el-dropdown-item> <el-button class="d2-ml-0 d2-mr btn-text" type="text">
</el-dropdown-menu> <d2-icon name="gamepad"/>
</el-dropdown> </el-button>
</el-tooltip>
</template> </template>

2
src/components/core/d2-layout-main/components/-header-right/components/-user.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<el-dropdown class="d2-mr"> <el-dropdown class="d2-mr">
<span class="el-dropdown-link">你好</span> <span class="btn-text">你好</span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="logOff"><d2-icon name="power-off"/> 注销</el-dropdown-item> <el-dropdown-item @click.native="logOff"><d2-icon name="power-off"/> 注销</el-dropdown-item>
<el-dropdown-item><d2-icon name="user-circle-o"/> 个人中心</el-dropdown-item> <el-dropdown-item><d2-icon name="user-circle-o"/> 个人中心</el-dropdown-item>

1
static/image/theme-preview/star@2x.png.REMOVED.git-id Normal file
View File

@@ -0,0 +1 @@
a2ed3f2203f8040f54c623f3b0d07ee16277d514