Skip to content

Commit

Permalink
[FIX] Adds padding to sidebar when server list is showing (RocketChat…
Browse files Browse the repository at this point in the history
…#590)

Adds padding to sidebar when server list is showing
  • Loading branch information
gdelavald authored Nov 7, 2017
1 parent 52628c2 commit 6a85f00
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 4 deletions.
9 changes: 7 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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 -->
File renamed without changes.
File renamed without changes.
10 changes: 10 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/scripts/sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;}'); } });
}
}

Expand All @@ -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;}'); } });
}
}

Expand Down

0 comments on commit 6a85f00

Please sign in to comment.