diff --git a/design.sketch.REMOVED.git-id b/design.sketch.REMOVED.git-id index d4ce923b..a8813a10 100644 --- a/design.sketch.REMOVED.git-id +++ b/design.sketch.REMOVED.git-id @@ -1 +1 @@ -e8516ea88601f01f9a34696023fe735bf963b9c1 \ No newline at end of file +5093a7ef18a7f5ed05e66c3db85c4dcf91d59dbf \ No newline at end of file diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md index df1e7288..85062358 100644 --- a/docs/zh/guide/change-log.md +++ b/docs/zh/guide/change-log.md @@ -1,5 +1,13 @@ # 更新日志 +## v1.1.3 + +* [ 修复 ] 侧边栏在折叠时不显示的 bug +* [ 新增 ] v-charts 插件 +* [ 新增 ] 一些演示图表(后续打算把 v-charts 文档上有示例性的演示都展示一下) +* [ 修改 ] D2Admin 经典主题颜色调整 +* [ 新增 ] violet 主题 + ## v1.1.2 * [ 修改 ] 删除了 G2 相关的依赖 diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss index f4f4ef4b..b12d73b8 100644 --- a/src/assets/style/theme/d2/setting.scss +++ b/src/assets/style/theme/d2/setting.scss @@ -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; diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss index df1bd994..f5c41252 100644 --- a/src/assets/style/theme/theme.scss +++ b/src/assets/style/theme/theme.scss @@ -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; }