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
commit 6e1456b48d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 38 deletions

View File

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

View File

@ -1,5 +1,5 @@
<template>
<el-container id="settings">
<el-container id="settings">
<el-header class="header">
<el-row>
<el-col :span="23">
@ -18,7 +18,8 @@
class="setting-menu"
:text-color="primaryColor"
:background-color="backgroundColor"
:router="true">
:router="true"
>
<el-menu-item :index="`/${id()}/settings/general`">
<icon name="cog" class="icon" scale="1.3"></icon>
<span>{{ $t('settings.general.title') }}</span>
@ -33,7 +34,7 @@
<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;