Merge branch 'fix/replace-sidepanel-scroll-js-with-css' into 'develop'

Get rid of the js to scale sidepanel, add an additional div and a css class to fix the same issue.

See merge request pleroma/pleroma-fe!156

1 files changed, 0 insertions, 23 deletions

diff --git a/src/App.js b/src/App.js
index 3823bd03..1da3ff7c 100644
--- a/src/App.js
+++ b/src/App.js
@@ -23,18 +23,6 @@ export default {
     style () { return { 'background-image': `url(${this.background})` } },
     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: {
     activatePanel (panelName) {
       this.mobileActivePanel = panelName
@@ -44,17 +32,6 @@ export default {
     },
     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`
     }
   }
 }