Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make it sexier in macOS #336

Merged
merged 12 commits into from
Mar 29, 2017
Merged

Make it sexier in macOS #336

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0d1ed62
Make it sexier in macOS
edipox Feb 2, 2017
ecceaf2
Update background.js
edipox Feb 2, 2017
8e87d67
Inject custom style inside webview content
edipox Feb 16, 2017
f8e222f
Go back to a simpler (and working) approach to fix title bar issue
edipox Feb 16, 2017
b497b0d
Fix indentation
edipox Feb 16, 2017
c37a495
[macOS] Added animation for server list toggle
edipox Feb 22, 2017
eff06f3
[macOS] Fix issues found by codacy bot
edipox Feb 22, 2017
e881385
[macOS] Fix issues found by codacy bot
edipox Feb 22, 2017
7bf9921
[macOS] Fix issues found by codacy bot
edipox Feb 23, 2017
ab783a8
Fix conflicts with current develop branch
edipox Feb 23, 2017
bc928e0
[macOS] Fix issues found by codacy bot
edipox Feb 23, 2017
b1985c5
[macOS] Fix sidebar toggle script
edipox Feb 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ app.on('ready', function () {

var mainWindow = createWindow('main', {
width: 1000,
titleBarStyle: 'hidden',
height: 600
});

Expand Down
8 changes: 8 additions & 0 deletions src/scripts/sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,20 @@ class SideBar extends EventEmitter {
document.body.classList.add('hide-server-list');
localStorage.setItem('sidebar-closed', 'true');
this.emit('hide');
if (process.platform === 'darwin') {
[].forEach.call(document.getElementsByTagName('webview'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you use querySelectorAll('webview') you can use forEach like document.querySelectorAll('webview').forEach(... instead of using [].forEach

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first time I tried I got an error that's why a went getElementsByTagName, but I guess the error was related to something else because it's working now 👍

(webviewObj) => { if (webviewObj.insertCSS) { webviewObj.insertCSS('aside.side-nav{margin-top:15px;overflow:hidden; transition: margin .5s ease-in-out; }'); } });
}
}

show () {
document.body.classList.remove('hide-server-list');
localStorage.setItem('sidebar-closed', 'false');
this.emit('show');
if (process.platform === 'darwin') {
[].forEach.call(document.getElementsByTagName('webview'),
(webviewObj) => { if (webviewObj.insertCSS) { webviewObj.insertCSS('aside.side-nav{margin-top:0; overflow:hidden; transition: margin .5s ease-in-out; }'); } });
}
}

toggle () {
Expand Down
1 change: 1 addition & 0 deletions src/stylesheets/main.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ input[type='password'] {
padding: 45px 0 35px;
z-index: 10;
position: relative;
-webkit-app-region: no-drag;
}
.share {
border-radius: 50%;
Expand Down
10 changes: 9 additions & 1 deletion src/stylesheets/start-page.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ div.server-list {
bottom: 0;
height: 100%;
width: 80px;
padding-top: 5px;
padding-top: 22px;
background-color: #0F354C;
z-index: 100000;
-webkit-app-region: drag;
}

div.server-list ul {
Expand Down Expand Up @@ -175,6 +176,7 @@ div.server-list li:before {

.hide-server-list webview {
left: 0;
transition: left 0.5s ease-in-out;
}

@-webkit-keyframes wrong {
Expand Down Expand Up @@ -238,4 +240,10 @@ webview.active {

.landing-page {
z-index: 1;
-webkit-app-region: drag;
}

body,
html {
-webkit-app-region: drag;
}