Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions site/src/components/FullPageLayout/Topbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,16 @@ export const TopbarButton: React.FC<ButtonProps> = ({ ...props }) => {
return <Button variant="outline" size="sm" {...props} />;
};

export const TopbarData: FC<HTMLAttributes<HTMLDivElement>> = (props) => {
return <div {...props} className="flex gap-2 items-center justify-center" />;
export const TopbarData: FC<HTMLAttributes<HTMLDivElement>> = ({
className,
...props
}) => {
return (
<div
{...props}
className={cn("flex gap-2 items-center justify-center", className)}
/>
);
};

export const TopbarDivider: FC<
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ export const WorkspaceActions: FC<WorkspaceActionsProps> = ({
};

return (
<div className="flex items-center gap-2" data-testid="workspace-actions">
<div
className="flex flex-wrap items-center justify-end gap-2"
data-testid="workspace-actions"
>
{/* Restarting must be handled separately, because it otherwise would appear as stopping */}
{isUpdating
? buttonMapping.updating
Expand Down
6 changes: 3 additions & 3 deletions site/src/pages/WorkspacePage/WorkspaceTopbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export const WorkspaceTopbar: FC<WorkspaceTopbarProps> = ({
);

return (
<Topbar className="[grid-area:topbar]">
<Topbar className="[grid-area:topbar] flex-wrap gap-y-2">
<Tooltip>
<TooltipTrigger asChild>
<TopbarIconButton asChild>
Expand All @@ -130,7 +130,7 @@ export const WorkspaceTopbar: FC<WorkspaceTopbarProps> = ({
</Tooltip>

<div className="flex items-center gap-y-6 gap-x-2 flex-wrap px-3 py-2 mr-auto">
<TopbarData>
<TopbarData className="flex-wrap">
<OwnerBreadcrumb
ownerName={workspace.owner_name}
ownerAvatarUrl={workspace.owner_avatar_url}
Expand Down Expand Up @@ -217,7 +217,7 @@ export const WorkspaceTopbar: FC<WorkspaceTopbarProps> = ({
</div>

{!isImmutable && (
<div className="flex items-center gap-4">
<div className="flex flex-wrap grow items-center justify-end gap-x-4 gap-y-2 min-h-12">
<WorkspaceScheduleControls
workspace={workspace}
template={template}
Expand Down
Loading