Skip to content

Commit 6a85f00

Browse files
authored
[FIX] Adds padding to sidebar when server list is showing (RocketChat#590)
Adds padding to sidebar when server list is showing
1 parent 52628c2 commit 6a85f00

File tree

5 files changed

+19
-4
lines changed

5 files changed

+19
-4
lines changed

.github/PULL_REQUEST_TEMPLATE.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
<!-- INSTRUCTION: Your Pull Request name should start with one of the following tags -->
2+
<!-- [NEW] For new features -->
3+
<!-- [FIX] For bug fixes -->
4+
<!-- [BREAK] For pull requests including breaking changes -->
5+
16
<!-- INSTRUCTION: Keep the line below to notify all core developers about this new PR -->
2-
@RocketChat/DesktopApp
7+
@RocketChat/desktopapp
38

49
<!-- INSTRUCTION: Inform the issue number that this PR closes, or remove the line below -->
510
Closes #ISSUE_NUMBER
611

7-
<!-- INSTRUCTION: Tell us more about your PR -->
12+
<!-- INSTRUCTION: Tell us more about your PR with screen shots if you can -->
File renamed without changes.

package.json

+10
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@
4141
"allowElevation": true,
4242
"allowToChangeInstallationDirectory": true
4343
},
44+
"appx": {
45+
"backgroundColor": "#2f343d",
46+
"displayName": "Rocket.Chat",
47+
"publisherDisplayName": "Rocket.Chat",
48+
"languages": [
49+
"en-US",
50+
"en-GB",
51+
"pt-BR"
52+
]
53+
},
4454
"linux": {
4555
"desktop": {
4656
"Categories": "GNOME;GTK;Network;InstantMessaging",

src/scripts/sidebar.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ class SideBar extends EventEmitter {
272272
this.emit('hide');
273273
if (process.platform === 'darwin') {
274274
document.querySelectorAll('webview').forEach(
275-
(webviewObj) => { if (webviewObj.insertCSS) { webviewObj.insertCSS('aside.side-nav{margin-top:15px;overflow:hidden; transition: margin .5s ease-in-out; }'); } });
275+
(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;}'); } });
276276
}
277277
}
278278

@@ -282,7 +282,7 @@ class SideBar extends EventEmitter {
282282
this.emit('show');
283283
if (process.platform === 'darwin') {
284284
document.querySelectorAll('webview').forEach(
285-
(webviewObj) => { if (webviewObj.insertCSS) { webviewObj.insertCSS('aside.side-nav{margin-top:0; overflow:hidden; transition: margin .5s ease-in-out; }'); } });
285+
(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;}'); } });
286286
}
287287
}
288288

0 commit comments

Comments
 (0)