Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1052 from h3poteto/fix/design/scroll 

Fix scrollbar design for preferences and settings
This commit is contained in:
AkiraFukushima 2019-09-27 00:02:52 +09:00 committed by GitHub
parent fb94a9e0f5 8ec06a768b
commit 6e1456b48d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/renderer/components/Preferences.vue
View File

@ -74,6 +74,7 @@ export default {
<style lang="scss" scoped>
#preferences {
height: 100%;
overflow: auto;
.header {
text-align: center;

78
src/renderer/components/Settings.vue
View File

@ -1,39 +1,40 @@
<template>
<el-container id="settings">
<el-header class="header">
<el-row>
<el-col :span="23">
<h1>{{ $t('settings.title') }}</h1>
</el-col>
<el-col :span="1">
<el-button type="text" icon="el-icon-close" @click="close" class="close-button" role="button"></el-button>
</el-col>
</el-row>
</el-header>
<el-container>
<div v-shortkey="['esc']" @shortkey="close"></div>
<el-aside width="240px" class="menu">
<el-menu
:default-active="activeRoute()"
class="setting-menu"
:text-color="primaryColor"
:background-color="backgroundColor"
:router="true">
<el-menu-item :index="`/${id()}/settings/general`">
<icon name="cog" class="icon" scale="1.3"></icon>
<span>{{ $t('settings.general.title') }}</span>
</el-menu-item>
<el-menu-item :index="`/${id()}/settings/timeline`">
<icon name="align-left" class="icon" scale="1.3"></icon>
<span>{{ $t('settings.timeline.title') }}</span>
</el-menu-item>
</el-menu>
</el-aside>
<el-main>
<router-view></router-view>
</el-main>
<el-container id="settings">
<el-header class="header">
<el-row>
<el-col :span="23">
<h1>{{ $t('settings.title') }}</h1>
</el-col>
<el-col :span="1">
<el-button type="text" icon="el-icon-close" @click="close" class="close-button" role="button"></el-button>
</el-col>
</el-row>
</el-header>
<el-container>
<div v-shortkey="['esc']" @shortkey="close"></div>
<el-aside width="240px" class="menu">
<el-menu
:default-active="activeRoute()"
class="setting-menu"
:text-color="primaryColor"
:background-color="backgroundColor"
:router="true"
>
<el-menu-item :index="`/${id()}/settings/general`">
<icon name="cog" class="icon" scale="1.3"></icon>
<span>{{ $t('settings.general.title') }}</span>
</el-menu-item>
<el-menu-item :index="`/${id()}/settings/timeline`">
<icon name="align-left" class="icon" scale="1.3"></icon>
<span>{{ $t('settings.timeline.title') }}</span>
</el-menu-item>
</el-menu>
</el-aside>
<el-main>
<router-view></router-view>
</el-main>
</el-container>
</el-container>
</el-container>
</template>
<script>
@ -47,18 +48,18 @@ export default {
backgroundColor: state => state.App.theme.background_color
})
},
created () {
created() {
this.$store.commit('Settings/changeAccountID', this.id())
this.$router.push(`/${this.id()}/settings/general`)
},
methods: {
id () {
id() {
return this.$route.params.id
},
close () {
close() {
this.$router.push(`/${this.id()}/home`)
},
activeRoute () {
activeRoute() {
return this.$route.path
}
}
@ -68,6 +69,7 @@ export default {
<style lang="scss" scoped>
#settings {
height: 100%;
overflow: auto;
.header {
text-align: center;