diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-13 10:57:33 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-13 10:57:33 +0000 |
| commit | 7403c6c3dcad9bcf31bb11c271a1ea7d4225c2af (patch) | |
| tree | 782d7938d8bdbcc1071acda9f49fdeafce50dc84 /src/App.vue | |
| parent | 03190ab124253f30ddce40c6541afe6154b58339 (diff) | |
| parent | 4cc73cfe217ebc15136451ede050e5b8d5024328 (diff) | |
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
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/App.vue b/src/App.vue index 59cfcaa6..0d004665 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,6 @@ <template> <div id="app" v-bind:style="style" class="base02-background"> - <nav class='container base01-background base04' @click="scrollToTop()"> + <nav class='container base01-background base04' @click="scrollToTop()" id="nav"> <div class='inner-nav' :style="logoStyle"> <div class='item'> <router-link :to="{ name: 'root'}">{{sitename}}</router-link> @@ -18,11 +18,13 @@ <button @click="activatePanel('timeline')" class="base01-background base04">Timeline</button> </div> <div class="sidebar-flexer" :class="{ 'mobile-hidden': mobileActivePanel != 'sidebar'}"> - <div class="sidebar" :class="{ 'mobile-hidden': mobileActivePanel != 'sidebar' }"> - <div class="sidebar-container" id="sidebar-container"> - <user-panel></user-panel> - <nav-panel></nav-panel> - <notifications v-if="currentUser"></notifications> + <div class="sidebar-bounds"> + <div class="sidebar-scroller"> + <div class="sidebar"> + <user-panel></user-panel> + <nav-panel></nav-panel> + <notifications v-if="currentUser"></notifications> + </div> </div> </div> </div> |