Skip to content

Commit 32f59f1

Browse files
committed
[dashboard] Adjust styles in Settings menu and Account page
1 parent 3849537 commit 32f59f1

10 files changed

+38
-3400
lines changed

components/dashboard/src/components/SettingsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export function SettingsPage(p: Props) {
1313
<Header title={p.title} subtitle={p.subtitle}/>
1414
<div className='lg:px-28 px-10 flex pt-9'>
1515
<SubMenu entries={p.menuEntries} />
16-
<div className='ml-5 pl-12 w-full pt-1'>
16+
<div className='ml-32 w-full pt-1'>
1717
{p.children}
1818
</div>
1919
</div>

components/dashboard/src/components/SubMenu.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ export interface SubMenuEntry {
77

88
export function SubMenu(props: { entries: SubMenuEntry[] }) {
99
return <div>
10-
<ul className="flex flex-col text-sm text-gray-700 pt-4 lg:pt-0 w-48 space-y-2">
10+
<ul className="flex flex-col text-sm text-gray-500 pt-4 lg:pt-0 w-48 space-y-2">
1111
{props.entries.map(e => {
1212
let classes = "flex block py-2 font-sm px-4 rounded-md";
1313
if (e.link.toLowerCase() === window.location.pathname) {
14-
classes += " bg-gray-600 text-gray-100 ";
14+
classes += " bg-gray-800 text-gray-50";
1515
} else {
16-
classes += " text-gray-400 hover:bg-gray-300 hover:text-white ";
16+
classes += " hover:bg-gray-100";
1717
}
1818
return <Link to={e.link} key={e.title}>
1919
<li className={classes}>

components/dashboard/src/index.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@apply text-2xl text-gray-900 leading-9 font-semibold;
1616
}
1717
h4 {
18-
@apply pb-2 text-sm font-medium text-gray-500;
18+
@apply pb-2 text-sm font-medium text-gray-600;
1919
}
2020
p {
2121
@apply text-sm text-gray-400;
@@ -37,7 +37,11 @@
3737
}
3838

3939
input[type=text]::placeholder {
40-
@apply text-gray-400
40+
@apply text-gray-400;
41+
}
42+
43+
input[disabled] {
44+
@apply bg-gray-100 border-2 border-gray-300 text-gray-400;
4145
}
4246

4347
}

components/dashboard/src/settings/Account.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,29 @@ export default function Account() {
2121
</Modal>
2222

2323
<SettingsPage title='Account' subtitle='Profile details' menuEntries={settingsMenu}>
24-
<h3>Personal Information</h3>
24+
<h3>Profile</h3>
2525
<div className="flex flex-col lg:flex-row">
26-
<div className="pb-6">
27-
<div className="pt-6">
26+
<div>
27+
<div className="mt-4">
2828
<h4>Name</h4>
29-
<input type="text" value={user!.name} onChange={(v) => { console.log(v) }} />
29+
<input type="text" disabled={true} value={user!.name} onChange={(v) => { console.log(v) }} />
3030
</div>
31-
<div className="pt-6">
31+
<div className="mt-4">
3232
<h4>Email</h4>
33-
<input type="text" value={User.getPrimaryEmail(user!)} onChange={(v) => { console.log(v) }} />
33+
<input type="text" disabled={true} value={User.getPrimaryEmail(user!)} onChange={(v) => { console.log(v) }} />
3434
</div>
3535
</div>
3636
<div className="lg:pl-14">
37-
<div className="pt-6">
37+
<div className="mt-4">
3838
<h4>Avatar</h4>
3939
<img className="rounded-full w-24 h-24 border-2 border-transparent hover:border-indigo-400"
4040
src={user!.avatarUrl} alt={user!.name} />
4141
</div>
4242
</div>
4343
</div>
44-
<h3 className="pt-14">Delete Account</h3>
44+
<h3 className="mt-12">Delete Account</h3>
4545
<p className="text-sm text-gray-400 pb-4">This action will remove all the data associated with your account in Gitpod.</p>
46-
<button className="border-red-900 bg-red-500 hover:bg-red-700" onClick={() => setModal(true)}>Delete Account</button>
46+
<button className="border-red-600 text-red-600 bg-white hover:border-red-800 hover:text-red-800" onClick={() => setModal(true)}>Delete Account</button>
4747
</SettingsPage>
4848
</div>;
4949
}

components/dashboard/src/settings/EnvironmentVariables.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import settingsMenu from './settings-menu';
44
export default function EnvVars() {
55
return <div>
66
<SettingsPage title='Environment Variables' subtitle='Configure environment variables for your workspaces' menuEntries={settingsMenu}>
7-
<div className="lg:px-28 px-10 flex pt-10">
8-
Environment Variables
9-
</div>
7+
<h3>Environment Variables</h3>
108
</SettingsPage>
119
</div>;
1210
}

components/dashboard/src/settings/GitIntegrations.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import settingsMenu from './settings-menu';
44
export default function GitIntegrations() {
55
return <div>
66
<SettingsPage title='Git Integrations' subtitle='Manage integration with your Git hosters' menuEntries={settingsMenu}>
7-
<div className="lg:px-28 px-10 flex pt-10">
8-
Git Hoster Access Control
9-
</div>
7+
<h3>Git Hoster Access Control</h3>
108
</SettingsPage>
119
</div>;
1210
}

components/dashboard/src/settings/Notifications.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import settingsMenu from "./settings-menu";
44
export default function Notifications() {
55
return <div>
66
<SettingsPage title='Notifications' subtitle='Email notification preferences' menuEntries={settingsMenu}>
7-
<div className="lg:px-28 px-10 flex pt-10">
8-
Notifications
9-
</div>
7+
<h3>Notifications</h3>
108
</SettingsPage>
119
</div>;
1210
}

components/dashboard/src/settings/Plans.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import settingsMenu from "./settings-menu";
44
export default function Plans() {
55
return <div>
66
<SettingsPage title='Plans' subtitle='Plans and Usage' menuEntries={settingsMenu} >
7-
<div className="lg:px-28 px-10 flex pt-10">
8-
Plans
9-
</div>
7+
<h3>Plans</h3>
108
</SettingsPage>
119
</div>;
1210
}

0 commit comments

Comments
 (0)