Skip to content

Commit 08d2437

Browse files
committed
settings height done
1 parent a633bc4 commit 08d2437

File tree

3 files changed

+41
-29
lines changed

3 files changed

+41
-29
lines changed

client/src/components/Settings.js

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import './settings.css';
1515

1616
const Settings = ({ verifyGithubToken, verifyBitlyToken, resetTokens }) => {
1717
return (
18-
<div className="settings">
18+
<div className="settings-area">
1919
<AppBar
2020
position="static"
2121
color="default"
@@ -34,29 +34,35 @@ const Settings = ({ verifyGithubToken, verifyBitlyToken, resetTokens }) => {
3434
<Typography variant="h6">Settings</Typography>
3535
</Toolbar>
3636
</AppBar>
37-
<div className="content">
38-
<TokenInput
39-
onSubmit={verifyGithubToken}
40-
name="GitHub"
41-
instruction="Generate a personal access token from GitHub. This access token should have the scope to 'Create Gists'"
42-
/>
43-
<TokenInput
44-
onSubmit={verifyBitlyToken}
45-
name="Bitly"
46-
instruction="Genrate a Generic Access token from Bitly"
47-
/>
48-
<div className="aciton">
49-
<button onClick={() => resetTokens()} className="btn-reset">
50-
Reset
51-
</button>
52-
</div>
53-
<div className="privacy">
54-
<p>
55-
<strong>
56-
We don't store any of these keys. Everything is done
57-
locally. Thus your information is kept safe.
58-
</strong>
59-
</p>
37+
<div className="settings">
38+
<div className="content">
39+
<TokenInput
40+
onSubmit={verifyGithubToken}
41+
name="GitHub"
42+
instruction="Generate a personal access token from GitHub. This access token should have the scope to 'Create Gists'"
43+
/>
44+
<TokenInput
45+
onSubmit={verifyBitlyToken}
46+
name="Bitly"
47+
instruction="Genrate a Generic Access token from Bitly"
48+
/>
49+
<div className="aciton">
50+
<button
51+
onClick={() => resetTokens()}
52+
className="btn-reset"
53+
>
54+
Reset
55+
</button>
56+
</div>
57+
<div className="privacy">
58+
<p>
59+
<strong>
60+
We don't store any of these keys. Everything is
61+
done locally. Thus your information is kept
62+
safe.
63+
</strong>
64+
</p>
65+
</div>
6066
</div>
6167
</div>
6268
</div>

client/src/components/settings.css

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
.settings .MuiToolbar-regular {
1+
.settings-area .MuiToolbar-regular {
22
min-height: 48px;
33
}
44

5-
.settings .MuiIconButton-root:hover {
5+
.settings-area .MuiIconButton-root:hover {
66
border-radius: 100%;
77
}
88

9+
.settings {
10+
display: flex;
11+
width: 100%;
12+
height: 100vh;
13+
}
14+
915
.settings .content {
16+
flex: 1;
1017
margin-top: 45px;
1118
padding: 15px;
12-
height: 380px;
13-
overflow-y: scroll;
19+
overflow: auto;
1420
}
1521

1622
.settings .content .btn-reset {

src/module/ApplicationTray.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class ApplicationTray extends Tray {
99
this.mainWindow = mainWindow;
1010
this.on('click', this.onClick.bind(this));
1111
this.on('right-click', this.onRightClick.bind(this));
12-
this.setToolTip('DevTop');
12+
this.setToolTip('DevTop Essentials');
1313
this.autoStart = false;
1414
this.setAutoStart();
1515
}

0 commit comments

Comments
 (0)