Finished: macOS new theme color

This commit is contained in:
Molunerfinn 2018-12-28 20:30:47 +08:00
parent d0fdbf1ea2
commit 2b94fe49a2
2 changed files with 37 additions and 8 deletions

View File

@ -1,7 +1,9 @@
<template> <template>
<div id="setting-page"> <div id="setting-page">
<div class="fake-title-bar"> <div class="fake-title-bar" :class="{ 'darwin': os === 'darwin' }">
PicGo - {{ version }} <div class="fake-title-bar__title">
PicGo - {{ version }}
</div>
<div class="handle-bar" v-if="os !== 'darwin'"> <div class="handle-bar" v-if="os !== 'darwin'">
<i class="el-icon-minus" @click="minimizeWindow"></i> <i class="el-icon-minus" @click="minimizeWindow"></i>
<i class="el-icon-circle-plus-outline" @click="openMiniWindow"></i> <i class="el-icon-circle-plus-outline" @click="openMiniWindow"></i>
@ -55,7 +57,12 @@
</el-menu> </el-menu>
<i class="el-icon-info setting-window" @click="openDialog"></i> <i class="el-icon-info setting-window" @click="openDialog"></i>
</el-col> </el-col>
<el-col :span="19" :offset="5" style="height: 428px"> <el-col
:span="19"
:offset="5"
style="height: 428px"
class="main-wrapper"
:class="{ 'darwin': os === 'darwin' }">
<transition name="picgo-fade" mode="out-in"> <transition name="picgo-fade" mode="out-in">
<router-view :key="$route.params ? $route.params.type : $route.path"></router-view> <router-view :key="$route.params ? $route.params.type : $route.path"></router-view>
</transition> </transition>
@ -281,6 +288,7 @@ export default {
} }
</script> </script>
<style lang='stylus'> <style lang='stylus'>
$darwinBg = transparentify(#172426, #000, 0.7)
.picgo-fade .picgo-fade
&-enter, &-enter,
&-leave, &-leave,
@ -305,6 +313,17 @@ export default {
line-height h line-height h
position fixed position fixed
z-index 100 z-index 100
&.darwin
background transparent
background-image linear-gradient(
to right,
transparent 0%,
transparent 167px,
$darwinBg 167px,
$darwinBg 100%
)
&__title
padding-left 167px
.handle-bar .handle-bar
position absolute position absolute
top 2px top 2px
@ -324,6 +343,9 @@ export default {
.el-icon-circle-plus-outline .el-icon-circle-plus-outline
&:hover &:hover
color #69C282 color #69C282
.main-wrapper
&.darwin
background $darwinBg
.side-bar-menu .side-bar-menu
position fixed position fixed
height calc(100vh - 22px) height calc(100vh - 22px)
@ -334,7 +356,7 @@ export default {
position fixed position fixed
bottom 4px bottom 4px
left 4px left 4px
cursor pointer cursor poiter
color #878d99 color #878d99
transition .2s all ease-in-out transition .2s all ease-in-out
&:hover &:hover

View File

@ -13,8 +13,8 @@
</el-input> </el-input>
</el-row> </el-row>
<el-row :gutter="10" class="plugin-list" v-loading="loading"> <el-row :gutter="10" class="plugin-list" v-loading="loading">
<el-col :span="12" v-for="(item, index) in pluginList" :key="item.name"> <el-col :span="12" v-for="item in pluginList" :key="item.name">
<div class="plugin-item"> <div class="plugin-item" :class="{ 'darwin': os === 'darwin' }">
<img class="plugin-item__logo" :src="item.logo" <img class="plugin-item__logo" :src="item.logo"
onerror="this.src='static/logo.png'" onerror="this.src='static/logo.png'"
> >
@ -57,7 +57,7 @@
@click="buildContextMenu(item)" @click="buildContextMenu(item)"
></i> ></i>
<i <i
v-else="!item.enabled" v-else
class="el-icon-remove-outline" class="el-icon-remove-outline"
@click="buildContextMenu(item)" @click="buildContextMenu(item)"
></i> ></i>
@ -112,7 +112,8 @@ export default {
pluginNameList: [], pluginNameList: [],
loading: true, loading: true,
needReload: false, needReload: false,
id: '' id: '',
os: ''
} }
}, },
computed: { computed: {
@ -136,6 +137,7 @@ export default {
} }
}, },
created () { created () {
this.os = process.platform
this.$electron.ipcRenderer.on('pluginList', (evt, list) => { this.$electron.ipcRenderer.on('pluginList', (evt, list) => {
this.pluginList = list this.pluginList = list
this.pluginNameList = list.map(item => item.name) this.pluginNameList = list.map(item => item.name)
@ -361,6 +363,7 @@ export default {
} }
</script> </script>
<style lang='stylus'> <style lang='stylus'>
$darwinBg = #172426
#plugin-view #plugin-view
position relative position relative
padding 0 20px 0 padding 0 20px 0
@ -399,6 +402,10 @@ export default {
user-select text user-select text
transition all .2s ease-in-out transition all .2s ease-in-out
margin-bottom 10px margin-bottom 10px
&.darwin
background transparentify($darwinBg, #000, 0.75)
&:hover
background transparentify($darwinBg, #000, 0.85)
&:hover &:hover
background #333 background #333
&__logo &__logo