Merge branch 'fix/sidepanel-gap-consistency-fix' into 'develop'

Fix sidepanel gap

See merge request pleroma/pleroma-fe!148
This commit is contained in:
lambda 2017-11-13 09:11:50 +00:00
commit d7e4279c59
3 changed files with 29 additions and 3 deletions

View file

@ -23,6 +23,18 @@ export default {
style () { return { 'background-image': `url(${this.background})` } }, style () { return { 'background-image': `url(${this.background})` } },
sitename () { return this.$store.state.config.name } sitename () { return this.$store.state.config.name }
}, },
created () {
// this is to detect user zooming mostly
window.addEventListener('resize', this.fixSidebarWidth)
},
mounted () {
// for some reason, at least in dev mode, dom is not ready enough at this point
// in theory calling the function directly here should be enough, but it's not
setTimeout(() => { this.fixSidebarWidth() }, 500)
},
destroyed () {
window.removeEventListener('resize', this.fixSidebarWidth)
},
methods: { methods: {
activatePanel (panelName) { activatePanel (panelName) {
this.mobileActivePanel = panelName this.mobileActivePanel = panelName
@ -32,6 +44,17 @@ export default {
}, },
logout () { logout () {
this.$store.dispatch('logout') this.$store.dispatch('logout')
},
fixSidebarWidth () {
// firefox
let barwidth = window.innerWidth - document.body.offsetWidth
if (document.body.offsetWidth <= 0) {
// chromium
barwidth = window.innerWidth - document.body.scrollWidth
}
// adjust the sidebar size to fit the scrollbar width to keep the gap consistently sized
document.getElementById('sidebar-container').style.width = `${345 + barwidth}px`
document.getElementById('sidebar-container').style.paddingRight = `${barwidth}px`
} }
} }
} }

View file

@ -218,16 +218,19 @@ nav {
} }
@media all and (min-width: 960px) { @media all and (min-width: 960px) {
body {
overflow-y: scroll;
}
.sidebar { .sidebar {
overflow: hidden; overflow: hidden;
max-height: 100vh; max-height: 100vh;
width: 350px; width: 345px;
position: fixed; position: fixed;
margin-top: -10px; margin-top: -10px;
.sidebar-container { .sidebar-container {
height: 96vh; height: 96vh;
width: 362px; width: 365px;
padding-top: 10px; padding-top: 10px;
padding-right: 20px; padding-right: 20px;
overflow-x: hidden; overflow-x: hidden;

View file

@ -19,7 +19,7 @@
</div> </div>
<div class="sidebar-flexer" :class="{ 'mobile-hidden': mobileActivePanel != 'sidebar'}"> <div class="sidebar-flexer" :class="{ 'mobile-hidden': mobileActivePanel != 'sidebar'}">
<div class="sidebar" :class="{ 'mobile-hidden': mobileActivePanel != 'sidebar' }"> <div class="sidebar" :class="{ 'mobile-hidden': mobileActivePanel != 'sidebar' }">
<div class="sidebar-container"> <div class="sidebar-container" id="sidebar-container">
<user-panel></user-panel> <user-panel></user-panel>
<nav-panel></nav-panel> <nav-panel></nav-panel>
<notifications v-if="currentUser"></notifications> <notifications v-if="currentUser"></notifications>