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

no message

Browse Source 
Former-commit-id: f86bfe3545b73c3d36c515e05670ad634faf8466 [formerly f86bfe3545b73c3d36c515e05670ad634faf8466 [formerly f86bfe3545b73c3d36c515e05670ad634faf8466 [formerly f86bfe3545b73c3d36c515e05670ad634faf8466 [formerly 89528de438671732689e92934ec2ade9553d9ede [formerly d92e6d38f02a79f3d10872fdd69ab57d057ab98a]]]]]
Former-commit-id: 9601235794926232aee7ba5ebddf50f0313d8866
Former-commit-id: 70e528edc666fd7b8eb2b31d574c136acdaae22b
Former-commit-id: 067944588124b96c0e563ddd4ce033f9e6f4493f [formerly 32497a996aeb54998149ad68543d656af685af9d]
Former-commit-id: 603dfd3910d1e387a2a3f5453ed6b04cfac45791
Former-commit-id: d57997923342d4e9a767053bf1cb2da355975210
Former-commit-id: b8fc752f4bb8907daf972f6757aa4d53f6794ec3
Former-commit-id: dc0e460b5c00a1f18b3c2e07bb98dc368d2999a4
Former-commit-id: 42c8f6122b3dd94e7c8f954d6634afac485f50f6
This commit is contained in:
liyang
2018-06-27 22:21:36 +08:00
parent b6ff6d3e1d
commit 0718fb9475
4 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
design.sketch.REMOVED.git-id
View File

@@ -1 +1 @@
e8516ea88601f01f9a34696023fe735bf963b9c1
5093a7ef18a7f5ed05e66c3db85c4dcf91d59dbf

8
docs/zh/guide/change-log.md
View File

@@ -1,5 +1,13 @@
# 更新日志
## v1.1.3
* [ 修复 ] 侧边栏在折叠时不显示的 bug
* [ 新增 ] v-charts 插件
* [ 新增 ] 一些演示图表（后续打算把 v-charts 文档上有示例性的演示都展示一下）
* [ 修改 ] D2Admin 经典主题颜色调整
* [ 新增 ] violet 主题
## v1.1.2
* [ 修改 ] 删除了 G2 相关的依赖

30
src/assets/style/theme/d2/setting.scss
View File

@@ -1,15 +1,15 @@
// 主题名称
$theme-name: 'd2';
// 主题背景颜色
$theme-bg-color: #f8f8f9;
$theme-bg-color: #ebf1f6;
// 主题背景图片遮罩
$theme-bg-mask: rgba(#000, 0);
// container组件
$theme-container-background-color: rgba(#FFF, 1);
$theme-container-header-footer-background-color: rgba(#FFF, .6);
$theme-container-border-inner: 1px solid $color-border-2;
$theme-container-border-outer: 1px solid $color-border-1;
$theme-container-border-inner: 1px solid #cfd7e5;
$theme-container-border-outer: 1px solid #cfd7e5;
// 顶栏和侧边栏中展开的菜单 hover 状态下
$theme-menu-item-color-hover: #293849;
@@ -19,27 +19,27 @@ $theme-menu-item-background-color-hover: #ecf5ff;
$theme-header-item-color: $color-text-normal;
$theme-header-item-background-color: transparent;
// 顶栏上的项目在 hover 时
$theme-header-item-color-hover: $color-text-main;
$theme-header-item-background-color-hover: rgba(#000, .02);
$theme-header-item-color-hover: #2f74ff;
$theme-header-item-background-color-hover: rgba(#FFF, .5);
// 顶栏上的项目在 focus 时
$theme-header-item-color-focus: $color-text-main;
$theme-header-item-background-color-focus: rgba(#000, .02);
$theme-header-item-color-focus: #2f74ff;
$theme-header-item-background-color-focus: rgba(#FFF, .5);
// 顶栏上的项目在 active 时
$theme-header-item-color-active: $color-text-main;
$theme-header-item-background-color-active: rgba(#000, .03);
$theme-header-item-color-active: #2f74ff;
$theme-header-item-background-color-active: rgba(#FFF, .5);
// 侧边栏上的文字颜色
$theme-aside-item-color: $color-text-normal;
$theme-aside-item-background-color: transparent;
// 侧边栏上的项目在 hover 时
$theme-aside-item-color-hover: $color-text-main;
$theme-aside-item-background-color-hover: rgba(#000, .02);
$theme-aside-item-color-hover: #2f74ff;
$theme-aside-item-background-color-hover: rgba(#FFF, .5);
// 侧边栏上的项目在 focus 时
$theme-aside-item-color-focus: $color-text-main;
$theme-aside-item-background-color-focus: rgba(#000, .02);
$theme-aside-item-color-focus: #2f74ff;
$theme-aside-item-background-color-focus: rgba(#FFF, .5);
// 侧边栏上的项目在 active 时
$theme-aside-item-color-active: $color-text-main;
$theme-aside-item-background-color-active: rgba(#000, .03);
$theme-aside-item-color-active: #2f74ff;
$theme-aside-item-background-color-active: rgba(#FFF, .5);
// 侧边栏菜单为空的时候显示的元素
$theme-aside-menu-empty-icon-color: $color-text-normal;

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

@@ -100,6 +100,7 @@
border-right: none;
.el-menu-item {
i {
margin-left: 4px;
margin-right: 5px;
font-size: 16px;
}
@@ -109,6 +110,7 @@
@extend %unable-select;
.el-submenu__title {
i {
margin-left: 4px;
margin-right: 5px;
font-size: 16px;
}