From 6a85f0088188c8dd2dfb0eb6e19680d5d4b2d3ab Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Tue, 7 Nov 2017 22:01:48 +0200
Subject: [PATCH] [FIX] Adds padding to sidebar when server list is showing
 (#590)

Adds padding to sidebar when server list is showing
---
 .github/PULL_REQUEST_TEMPLATE.md                       |  9 +++++++--
 ...as.inherit.plist => entitlements.mac.inherit.plist} |  0
 .../{entitlements.mas.plist => entitlements.mac.plist} |  0
 package.json                                           | 10 ++++++++++
 src/scripts/sidebar.js                                 |  4 ++--
 5 files changed, 19 insertions(+), 4 deletions(-)
 rename build/{entitlements.mas.inherit.plist => entitlements.mac.inherit.plist} (100%)
 rename build/{entitlements.mas.plist => entitlements.mac.plist} (100%)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 293057df68ff..bb4552ebe269 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,12 @@
+<!-- INSTRUCTION: Your Pull Request name should start with one of the following tags -->
+<!-- [NEW] For new features -->
+<!-- [FIX] For bug fixes -->
+<!-- [BREAK] For pull requests including breaking changes -->
+
 <!-- INSTRUCTION: Keep the line below to notify all core developers about this new PR -->
-@RocketChat/DesktopApp 
+@RocketChat/desktopapp 
 
 <!-- INSTRUCTION: Inform the issue number that this PR closes, or remove the line below -->
 Closes #ISSUE_NUMBER
 
-<!-- INSTRUCTION: Tell us more about your PR -->
+<!-- INSTRUCTION: Tell us more about your PR with screen shots if you can -->
diff --git a/build/entitlements.mas.inherit.plist b/build/entitlements.mac.inherit.plist
similarity index 100%
rename from build/entitlements.mas.inherit.plist
rename to build/entitlements.mac.inherit.plist
diff --git a/build/entitlements.mas.plist b/build/entitlements.mac.plist
similarity index 100%
rename from build/entitlements.mas.plist
rename to build/entitlements.mac.plist
diff --git a/package.json b/package.json
index 1d2dc6e9df67..50dd26447d78 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,16 @@
       "allowElevation": true,
       "allowToChangeInstallationDirectory": true
     },
+    "appx": {
+      "backgroundColor": "#2f343d",
+      "displayName": "Rocket.Chat",
+      "publisherDisplayName": "Rocket.Chat",
+      "languages": [
+        "en-US",
+        "en-GB",
+        "pt-BR"
+      ]
+    },
     "linux": {
       "desktop": {
         "Categories": "GNOME;GTK;Network;InstantMessaging",
diff --git a/src/scripts/sidebar.js b/src/scripts/sidebar.js
index 3b118c12bab8..caa650654a35 100644
--- a/src/scripts/sidebar.js
+++ b/src/scripts/sidebar.js
@@ -272,7 +272,7 @@ class SideBar extends EventEmitter {
         this.emit('hide');
         if (process.platform === 'darwin') {
             document.querySelectorAll('webview').forEach(
-                (webviewObj) => { if (webviewObj.insertCSS) { webviewObj.insertCSS('aside.side-nav{margin-top:15px;overflow:hidden; transition: margin .5s ease-in-out; }'); } });
+                (webviewObj) => { if (webviewObj.insertCSS) { webviewObj.insertCSS('aside.side-nav{margin-top:15px;overflow:hidden; transition: margin .5s ease-in-out; } .sidebar{padding-top:10px;transition: margin .5s ease-in-out;}'); } });
         }
     }
 
@@ -282,7 +282,7 @@ class SideBar extends EventEmitter {
         this.emit('show');
         if (process.platform === 'darwin') {
             document.querySelectorAll('webview').forEach(
-                (webviewObj) => { if (webviewObj.insertCSS) { webviewObj.insertCSS('aside.side-nav{margin-top:0; overflow:hidden; transition: margin .5s ease-in-out; }'); } });
+                (webviewObj) => { if (webviewObj.insertCSS) { webviewObj.insertCSS('aside.side-nav{margin-top:0; overflow:hidden; transition: margin .5s ease-in-out;} .sidebar{padding-top:0;transition: margin .5s ease-in-out;}'); } });
         }
     }