From 870cfe780eb422c3c4d7d724d54361e45e079b54 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 27 Jun 2018 01:34:01 +0800 Subject: [PATCH] no message Former-commit-id: d2d43cefdcf6072cd508d8e64062510ed5e3e086 [formerly d2d43cefdcf6072cd508d8e64062510ed5e3e086 [formerly d2d43cefdcf6072cd508d8e64062510ed5e3e086 [formerly d2d43cefdcf6072cd508d8e64062510ed5e3e086 [formerly b3fdc1e73b3414f9dfade8f485b99adbf036b2e9 [formerly c3700b44829953aea923edbf3ab5b9db6382930b]]]]] Former-commit-id: 471bdc0cbefdc936b366d35a158e964d74b26069 Former-commit-id: 25fc285a63059865e40dda86f5f5a13da4ab3671 Former-commit-id: 58b3261c8b573ceeaff5210cb0f7d8da615c2f90 [formerly 5235d2f5df43e0e0c9f1285ff565036dc296dc92] Former-commit-id: d19894aca0094ad1ac8b1bed2ddb73fdd1a21337 Former-commit-id: ca6fc0d78bf115e8c98c2a1977061fe7f910f6f0 Former-commit-id: 3fa391d327ac35fb4f5088e51387bbe8cad22274 Former-commit-id: 1d0ede8f99db796986dee5faf1960dab9cd33dde Former-commit-id: 24a84ded86b3b74efafb17442d9a1b0bf6533d4f --- design.sketch.REMOVED.git-id | 2 +- docs/.vuepress/dist | 2 +- src/assets/style/theme/register.scss | 3 +- src/assets/style/theme/violet/index.scss | 15 ++++++ src/assets/style/theme/violet/setting.scss | 50 +++++++++++++++++++ src/store/modules/theme.js | 5 ++ .../violet/preview@2x.png.REMOVED.git-id | 1 + 7 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 src/assets/style/theme/violet/index.scss create mode 100644 src/assets/style/theme/violet/setting.scss create mode 100644 static/image/theme/violet/preview@2x.png.REMOVED.git-id diff --git a/design.sketch.REMOVED.git-id b/design.sketch.REMOVED.git-id index 58f823eb..cd70fcbb 100644 --- a/design.sketch.REMOVED.git-id +++ b/design.sketch.REMOVED.git-id @@ -1 +1 @@ -4bcd95302c6d5c8ed1e44b96e2ba6978b84bea68 \ No newline at end of file +f2e3e8abaea29391a88143d573e6475fb46d2831 \ No newline at end of file diff --git a/docs/.vuepress/dist b/docs/.vuepress/dist index eb9a6e16..0e09e794 160000 --- a/docs/.vuepress/dist +++ b/docs/.vuepress/dist @@ -1 +1 @@ -Subproject commit eb9a6e16279f169d0edf538479b0e2b1c637565b +Subproject commit 0e09e794af40df0ee2e647108ae123286539cce1 diff --git a/src/assets/style/theme/register.scss b/src/assets/style/theme/register.scss index 21c4943c..4928b82d 100644 --- a/src/assets/style/theme/register.scss +++ b/src/assets/style/theme/register.scss @@ -1,4 +1,5 @@ @import '~@/assets/style/theme/d2/index.scss'; @import '~@/assets/style/theme/line/index.scss'; @import '~@/assets/style/theme/star/index.scss'; -@import '~@/assets/style/theme/tomorrow-night-blue/index.scss'; \ No newline at end of file +@import '~@/assets/style/theme/tomorrow-night-blue/index.scss'; +@import '~@/assets/style/theme/violet/index.scss'; \ No newline at end of file diff --git a/src/assets/style/theme/violet/index.scss b/src/assets/style/theme/violet/index.scss new file mode 100644 index 00000000..91e625ee --- /dev/null +++ b/src/assets/style/theme/violet/index.scss @@ -0,0 +1,15 @@ +@import '~@/assets/style/public.scss'; +@import './setting.scss'; +@import '../theme.scss'; + +.theme-#{$theme-name} { + + // 背景图片和遮罩 + .layout-main-group { + background: #9A00E3; + background: linear-gradient(120deg, #9A00E3 0%, #4EFFFB 100%); + .layout-main-mask { + background-color: $theme-bg-mask; + } + } +} \ No newline at end of file diff --git a/src/assets/style/theme/violet/setting.scss b/src/assets/style/theme/violet/setting.scss new file mode 100644 index 00000000..75b9d0bd --- /dev/null +++ b/src/assets/style/theme/violet/setting.scss @@ -0,0 +1,50 @@ +// 主题名称 +$theme-name: 'violet'; +// 主题背景颜色 +$theme-bg-color: #000; +// 主题背景图片遮罩 +$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 none; + +// 顶栏和侧边栏中展开的菜单 hover 状态下 +$theme-menu-item-color-hover: #293849; +$theme-menu-item-background-color-hover: #ecf5ff; + +// 顶栏上的文字颜色 +$theme-header-item-color: #FFF; +$theme-header-item-background-color: transparent; +// 顶栏上的项目在 hover 时 +$theme-header-item-color-hover: #FFF; +$theme-header-item-background-color-hover: rgba(#FFF, .1); +// 顶栏上的项目在 focus 时 +$theme-header-item-color-focus: #FFF; +$theme-header-item-background-color-focus: rgba(#000, .02); +// 顶栏上的项目在 active 时 +$theme-header-item-color-active: #FFF; +$theme-header-item-background-color-active: rgba(#000, .1); + +// 侧边栏上的文字颜色 +$theme-aside-item-color: #FFF; +$theme-aside-item-background-color: transparent; +// 侧边栏上的项目在 hover 时 +$theme-aside-item-color-hover: #FFF; +$theme-aside-item-background-color-hover: rgba(#000, .02); +// 侧边栏上的项目在 focus 时 +$theme-aside-item-color-focus: #FFF; +$theme-aside-item-background-color-focus: rgba(#000, .02); +// 侧边栏上的项目在 active 时 +$theme-aside-item-color-active: #FFF; +$theme-aside-item-background-color-active: rgba(#000, .1); + +// 侧边栏菜单为空的时候显示的元素 +$theme-aside-menu-empty-icon-color: #FFF; +$theme-aside-menu-empty-text-color: #FFF; +$theme-aside-menu-empty-background-color: rgba(#000, .1); +$theme-aside-menu-empty-icon-color-hover: #FFF; +$theme-aside-menu-empty-text-color-hover: #FFF; +$theme-aside-menu-empty-background-color-hover: rgba(#000, .05); \ No newline at end of file diff --git a/src/store/modules/theme.js b/src/store/modules/theme.js index 322ec8ce..4d26856a 100644 --- a/src/store/modules/theme.js +++ b/src/store/modules/theme.js @@ -8,6 +8,11 @@ export default { value: 'd2', preview: 'static/image/theme/d2/preview@2x.png' }, + { + name: '紫罗兰', + value: 'violet', + preview: 'static/image/theme/violet/preview@2x.png' + }, { name: '简约线条', value: 'line', diff --git a/static/image/theme/violet/preview@2x.png.REMOVED.git-id b/static/image/theme/violet/preview@2x.png.REMOVED.git-id new file mode 100644 index 00000000..b9837395 --- /dev/null +++ b/static/image/theme/violet/preview@2x.png.REMOVED.git-id @@ -0,0 +1 @@ +b400fea84568e744a413a3ebccbb07e7dc7b4e22 \ No newline at end of file