Skip to content

Commit 657d73f

Browse files
addressing nit fixes
1 parent 96c97ed commit 657d73f

File tree

2 files changed

+13
-19
lines changed

2 files changed

+13
-19
lines changed

components/dashboard/src/menu/Menu.tsx

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export default function Menu() {
8888
<div className="hidden md:flex items-center">
8989
<div className="h-6 w-px bg-gray-300 dark:bg-gray-600 mx-2" />
9090
<UserMenu user={user} className="" onFeedback={handleFeedbackFormClick} />
91-
<div className="pl-2">
91+
<div className="pl-4">
9292
<OrgPagesNav />
9393
</div>
9494
</div>
@@ -108,27 +108,21 @@ export default function Menu() {
108108
)}
109109
{!isDataOps && (
110110
<li>
111-
<a
112-
href="/"
113-
className="flex items-center gap-x-1 text-sm text-gray-500 dark:text-gray-400 hover:text-gray-900 dark:hover:text-white"
114-
>
111+
<div className="flex items-center gap-x-1 text-sm text-pk-content-secondary">
115112
<ProductLogo className="h-4 w-auto" />
116113
<span>Gitpod Classic</span>
117-
</a>
114+
</div>
118115
</li>
119116
)}
120117
</ul>
121118
</nav>
122119
{/* Right side items - Mobile Only */}
123120
<div className="flex items-center space-x-3 md:hidden">
124121
{!isDataOps && (
125-
<a
126-
href="/"
127-
className="flex items-center gap-x-1 text-sm text-gray-500 dark:text-gray-400 hover:text-gray-900 dark:hover:text-white"
128-
>
122+
<div className="flex items-center gap-x-1 text-sm text-pk-content-secondary">
129123
<ProductLogo className="h-4 w-auto" />
130124
<span>Gitpod Classic</span>
131-
</a>
125+
</div>
132126
)}
133127
</div>
134128
</div>
@@ -183,7 +177,7 @@ const UserMenu: FC<UserMenuProps> = ({ user, className, withAdminLink, onFeedbac
183177
const { data: installationConfig, isLoading: isInstallationConfigLoading } = useInstallationConfiguration();
184178
const isGitpodIo = isInstallationConfigLoading ? false : !installationConfig?.isDedicatedInstallation;
185179

186-
const extraSection = useMemo(() => {
180+
const adminSection = useMemo(() => {
187181
const items: ContextMenuEntry[] = [];
188182

189183
if (withAdminLink && user?.rolesOrPermissions?.includes(RoleOrPermission.ADMIN)) {
@@ -202,7 +196,7 @@ const UserMenu: FC<UserMenuProps> = ({ user, className, withAdminLink, onFeedbac
202196
}, [user?.rolesOrPermissions, withAdminLink]);
203197

204198
const menuEntries = useMemo(() => {
205-
const baseEntries: ContextMenuEntry[] = [
199+
const entries: ContextMenuEntry[] = [
206200
{
207201
title: (user && (getPrimaryEmail(user) || user?.name)) || "User",
208202
customFontStyle: "text-gray-400",
@@ -228,22 +222,22 @@ const UserMenu: FC<UserMenuProps> = ({ user, className, withAdminLink, onFeedbac
228222
];
229223

230224
if (isGitpodIo) {
231-
baseEntries.push({
225+
entries.push({
232226
title: "Feedback",
233227
onClick: onFeedback,
234228
separator: true,
235229
});
236230
}
237231

238-
baseEntries.push(...extraSection);
232+
entries.push(...adminSection);
239233

240-
baseEntries.push({
234+
entries.push({
241235
title: "Log out",
242236
href: gitpodHostUrl.asApiLogout().toString(),
243237
});
244238

245-
return baseEntries;
246-
}, [extraSection, user, isGitpodIo, onFeedback]);
239+
return entries;
240+
}, [adminSection, user, isGitpodIo, onFeedback]);
247241

248242
return (
249243
<div

components/dashboard/src/start/StartPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export function StartPage(props: StartPageProps) {
108108
error || phase === StartPhase.Stopped || phase === StartPhase.IdeReady ? "" : "animate-bounce"
109109
}`}
110110
/>
111-
{!isDataOps && <span className="block mt-2 text-gray-600 dark:text-gray-400">Gitpod Classic</span>}
111+
{!isDataOps && <span className="block mt-2 text-pk-content-secondary">Gitpod Classic</span>}
112112
<Heading2 className="mt-8">{title}</Heading2>
113113
{typeof phase === "number" && phase < StartPhase.IdeReady && (
114114
<ProgressBar phase={phase} error={!!error} />

0 commit comments

Comments
 (0)