Skip to content

Commit 252665b

Browse files
author
Emmanouil Konstantinidis
committed
Style settings, icons order and quit button
1 parent 2ea1c40 commit 252665b

File tree

3 files changed

+25
-8
lines changed

3 files changed

+25
-8
lines changed

src/js/components/navigation.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ var Navigation = React.createClass({
5959
this.context.router.transitionTo('notifications');
6060
},
6161

62-
appQuit: function () {
63-
ipc.sendChannel('app-quit');
64-
},
65-
6662
render: function () {
6763
var refreshIcon, logoutIcon, backIcon, settingsIcon;
6864
var loadingClass = this.state.loading ? 'fa fa-refresh fa-spin' : 'fa fa-refresh';
@@ -95,9 +91,8 @@ var Navigation = React.createClass({
9591
<img className='img-responsive' src='images/logo-hor-white.png' />
9692
</div>
9793
<div className='col-xs-4 right'>
98-
{logoutIcon}
9994
{settingsIcon}
100-
<i className="fa fa-power-off" onClick={this.appQuit} />
95+
{logoutIcon}
10196
</div>
10297
</div>
10398
</div>

src/js/components/settings.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
var React = require('react');
22
var Toggle = require('react-toggle');
33

4+
var ipc = window.require('ipc');
5+
46
var Actions = require('../actions/actions');
57
var SettingsStore = require('../stores/settings');
68

@@ -15,6 +17,10 @@ var SettingsPage = React.createClass({
1517
Actions.setSetting('participating', event.target.checked);
1618
},
1719

20+
appQuit: function () {
21+
ipc.sendChannel('app-quit');
22+
},
23+
1824
render: function () {
1925
return (
2026
<div className="container-fluid main-container settings">
@@ -26,6 +32,14 @@ var SettingsPage = React.createClass({
2632
onChange={this.toggleParticipating} />
2733
</div>
2834
</div>
35+
<div className='row'>
36+
<button
37+
className='btn btn-block btn-danger btn-close'
38+
onClick={this.appQuit}>
39+
<i className="fa fa-power-off" />
40+
Quit Gitify
41+
</button>
42+
</div>
2943
</div>
3044
);
3145
}

src/less/style.less

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,16 @@ html, body {
234234
color: @White;
235235
padding: 20px;
236236

237-
.col-xs-4 {
238-
text-align: right;
237+
.row {
238+
margin: 20px 10px;
239+
240+
.col-xs-4 {
241+
text-align: right;
242+
}
243+
244+
.btn-close {
245+
padding: 10px;
246+
}
239247
}
240248
}
241249

0 commit comments

Comments
 (0)