From d063cdf48e07b83f4d32be8eda4877da262ccaa4 Mon Sep 17 00:00:00 2001 From: Hunlongyu Date: Tue, 13 Oct 2020 11:31:56 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Frame=20=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 7 +- src/assets/scss/style.scss | 9 +++ src/assets/scss/theme.scss | 19 ++++++ src/assets/scss/theme/Light.scss | 60 ++++++++++++++++ src/background.js | 3 +- src/components/Frame.vue | 113 +++++++++++++++++++------------ vue.config.js | 5 ++ 7 files changed, 168 insertions(+), 48 deletions(-) create mode 100644 src/assets/scss/style.scss create mode 100644 src/assets/scss/theme.scss create mode 100644 src/assets/scss/theme/Light.scss diff --git a/src/App.vue b/src/App.vue index ec826e3..d469812 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,5 @@ @@ -11,12 +11,15 @@ export default { diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss new file mode 100644 index 0000000..3c6f01e --- /dev/null +++ b/src/assets/scss/style.scss @@ -0,0 +1,9 @@ +.zy-scrollbar{ + &::-webkit-scrollbar{ + width: 4px; + height: 1px; + } + &::-webkit-scrollbar-thumb { + border-radius: 2px; + } +} \ No newline at end of file diff --git a/src/assets/scss/theme.scss b/src/assets/scss/theme.scss new file mode 100644 index 0000000..fb59969 --- /dev/null +++ b/src/assets/scss/theme.scss @@ -0,0 +1,19 @@ +:root{ + // Light + --l-c-0: #823aa0; + --l-c-1: #823aa011; + --l-c-3: #823aa033; + --l-c-5: #823aa055; + --l-c-9: #823aa099; + --l-f-1: #808695; + --l-f-2: #332f5c; + --l-bgc-1: #ffffffff; + --l-bgc-2: #f2f6f9; + --l-bsc: 0 1px 3px #8e8da233, 0 1px 2px #8e8da244; + --l-bsc-hover: 0 14px 28px #8e8da255, 0 10px 10px #8e8da244; + --l-bsc-2: 0 -4px 23px 0 #8e8da233; + --l-bsc-scroll: inset 0 0 5px #823aa000; +} + +@import './theme/Light.scss'; +@import './style.scss'; diff --git a/src/assets/scss/theme/Light.scss b/src/assets/scss/theme/Light.scss new file mode 100644 index 0000000..4f03ff1 --- /dev/null +++ b/src/assets/scss/theme/Light.scss @@ -0,0 +1,60 @@ +.theme-light{ + background-color: var(--l-bgc-1); + .zy-scrollbar{ + &::-webkit-scrollbar-thumb { + box-shadow: var(--l-bsc-scroll); + background: var(--l-c-5); + } + &::-webkit-scrollbar-track { + box-shadow: var(--l-bsc-scroll); + background: var(--l-bgc-1); + } + } + .zy-frame{ + .middle{ + .btn:hover{ + .icon{ + stroke: var(--l-f-1); + } + } + .search{ + .active{ + stroke: var(--l-f-1); + } + .search-input{ + color: var(--l-f-1); + border: none; + border-bottom: 1px solid var(--l-c-0); + } + .search-box{ + color: var(--l-f-1); + background-color: var(--l-bgc-1); + box-shadow: var(--l-bsc); + transition: all 0.3s cubic-bezier(.25,.8,.25,1); + &:hover{ + box-shadow: var(--l-bsc-hover); + } + li:hover{ + background-color: var(--l-bgc-2); + } + } + } + } + .right{ + .btn:hover{ + background-color: var(--l-bgc-2); + .icon{ + stroke: var(--l-f-1); + } + } + .close:hover{ + .icon{ + stroke: red; + } + } + } + .icon{ + stroke: var(--l-c-0); + } + } +} \ No newline at end of file diff --git a/src/background.js b/src/background.js index 5630e38..86535da 100644 --- a/src/background.js +++ b/src/background.js @@ -24,7 +24,8 @@ function createWindow () { transparent: true, webPreferences: { webSecurity: false, - nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION + enableRemoteModule: true, + nodeIntegration: true } }) diff --git a/src/components/Frame.vue b/src/components/Frame.vue index dbb27b8..4ff7c6d 100644 --- a/src/components/Frame.vue +++ b/src/components/Frame.vue @@ -1,10 +1,10 @@