From 071b60b986e3bb57336a76ec92a3d59906b277f3 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sat, 3 Feb 2018 07:38:28 +0200
Subject: [PATCH] Move info to sidebar footer and set scroller padding

---
 .../styles/partials/generic/scrollable.scss    |  2 ++
 client/src/ui/components/BdSettings.vue        | 18 +++++++++---------
 client/src/ui/components/sidebar/Sidebar.vue   |  2 +-
 client/src/ui/components/sidebar/View.vue      |  1 +
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/client/src/styles/partials/generic/scrollable.scss b/client/src/styles/partials/generic/scrollable.scss
index e93a426f..5803d1a3 100644
--- a/client/src/styles/partials/generic/scrollable.scss
+++ b/client/src/styles/partials/generic/scrollable.scss
@@ -8,6 +8,8 @@
         flex-direction: column;
         overflow-y: auto;
         overflow-x: hidden;
+        padding: 10px 10px 10px 0;
+        margin: 10px 0;
 
         &::-webkit-scrollbar {
             width: 14px;
diff --git a/client/src/ui/components/BdSettings.vue b/client/src/ui/components/BdSettings.vue
index 9d8539b7..47e476b2 100644
--- a/client/src/ui/components/BdSettings.vue
+++ b/client/src/ui/components/BdSettings.vue
@@ -17,16 +17,16 @@
                     <span class="bd-x-text">ESC</span>
                 </div>
                 <SidebarItem v-for="item in sidebarItems" :item="item" :key="item.id" :onClick="itemOnClick" />
-                <div class="bd-info">
-                    <span class="bd-vtext">v2.0.0a by Jiiks/JsSucks</span>
-                    <div @click="openGithub" v-tooltip="'Github'" class="bd-material-button">
-                        <MiGithubCircle size="16"/>
-                    </div>
-                    <div @click="openWebsite" v-tooltip="'BetterDiscord'" class="bd-material-button">
-                        <MiWeb size="16"/>
-                     </div>
-                </div>
             </Sidebar>
+            <div slot="sidebarfooter" class="bd-info">
+                <span class="bd-vtext">v2.0.0a by Jiiks/JsSucks</span>
+                <div @click="openGithub" v-tooltip="'Github'" class="bd-material-button">
+                    <MiGithubCircle size="16" />
+                </div>
+                <div @click="openWebsite" v-tooltip="'BetterDiscord'" class="bd-material-button">
+                    <MiWeb size="16" />
+                </div>
+            </div>
             <ContentColumn slot="content">
                 <div v-if="activeContent('core') || animatingContent('core')" :class="{active: activeContent('core'), animating: animatingContent('core')}">
                     <CoreSettings :settings="coreSettings" :enableSetting="enableSetting" :disableSetting="disableSetting" />
diff --git a/client/src/ui/components/sidebar/Sidebar.vue b/client/src/ui/components/sidebar/Sidebar.vue
index e416fbaa..4f646599 100644
--- a/client/src/ui/components/sidebar/Sidebar.vue
+++ b/client/src/ui/components/sidebar/Sidebar.vue
@@ -9,7 +9,7 @@
 */
 
 <template>
-    <div class="bd-sidebar bd-scroller">
+    <div class="bd-sidebar">
         <slot/>
     </div>
 </template>
diff --git a/client/src/ui/components/sidebar/View.vue b/client/src/ui/components/sidebar/View.vue
index 75211a61..d4f39c04 100644
--- a/client/src/ui/components/sidebar/View.vue
+++ b/client/src/ui/components/sidebar/View.vue
@@ -16,6 +16,7 @@
                     <slot name="sidebar" />
                 </ScrollerWrap>
             </div>
+            <slot name="sidebarfooter"/>
         </div>
         <div class="bd-content-region">
             <slot name="content" />