Skip to content

Commit

Permalink
fix review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
ankormoreankor committed Feb 5, 2025
1 parent 958d068 commit 76ceae8
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { elements, logs, stages } from './mocks/mock-data'

export const ExecutionDetailsView = () => {
return (
<div className="flex flex-col h-full">
<div className="flex h-full flex-col">
<ExecutionTabs />
<ExecutionHeader
commitName="8fbru3ix"
Expand All @@ -24,7 +24,7 @@ export const ExecutionDetailsView = () => {
dataTransfer="4.21 kB/5 GB"
/>
<div className="grid h-[inherit]" style={{ gridTemplateColumns: '1fr 3fr' }}>
<div className="flex flex-col gap-4 border border-white/10 border-r-0 border-t-0">
<div className="flex flex-col gap-4 border border-r-0 border-t-0 border-white/10">
<PipelineStatus status={ExecutionState.RUNNING} buildTime="1h 30m" createdTime="10 mins ago" />
<ExecutionTree
defaultSelectedId="initialize"
Expand All @@ -34,7 +34,7 @@ export const ExecutionDetailsView = () => {
}}
/>
</div>
<div className="flex flex-col gap-4 border border-white/10 border-t-0">
<div className="flex flex-col gap-4 border border-t-0 border-white/10">
<ExecutionInfo
logs={logs}
onCopy={() => {}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useTranslationStore } from '../../i18n/stores/i18n-store'
export const ProjectSettingsLayout = () => {
return (
<>
<div className="bg-background-1 top-14.5 sticky z-40">
<div className="sticky top-14.5 z-40 bg-background-1">
<ProjectSettingsTabNav useTranslationStore={useTranslationStore} />
</div>
<Outlet />
Expand Down
2 changes: 1 addition & 1 deletion apps/gitness/src/pages-v2/project/settings-layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useTranslationStore } from '../../i18n/stores/i18n-store'
export const SettingsLayout = () => {
return (
<>
<div className="bg-background-1 sticky top-[55px] z-40">
<div className="sticky top-[55px] z-40 bg-background-1">
<ProjectSettingsTabNav useTranslationStore={useTranslationStore} />
</div>
<Outlet />
Expand Down
2 changes: 1 addition & 1 deletion apps/gitness/src/pages-v2/repo/repo-layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const RepoLayout = () => {

return (
<>
<div className="layer-high bg-background-1 top-14.5 sticky">
<div className="layer-high sticky top-14.5 bg-background-1">
<RepoSubheader showPipelinesTab={!isMFE} useTranslationStore={useTranslationStore} />
</div>
<Outlet />
Expand Down
4 changes: 2 additions & 2 deletions apps/gitness/src/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ import { ProjectLabelsList } from './pages-v2/project/labels/project-labels-list
import { ProjectGeneralSettingsPageContainer } from './pages-v2/project/project-general-settings-container'
import { ImportProjectContainer } from './pages-v2/project/project-import-container'
import { ProjectMemberListPage } from './pages-v2/project/project-member-list'
import { ProjectSettingsLayout } from './pages-v2/project/project-settings-layout.tsx'
import { ProjectSettingsLayout } from './pages-v2/project/project-settings-layout'
import PullRequestChanges from './pages-v2/pull-request/pull-request-changes'
import { PullRequestCommitPage } from './pages-v2/pull-request/pull-request-commits'
import { CreatePullRequest } from './pages-v2/pull-request/pull-request-compare'
import PullRequestConversationPage from './pages-v2/pull-request/pull-request-conversation'
import PullRequestDataProvider from './pages-v2/pull-request/pull-request-data-provider'
import PullRequestLayout from './pages-v2/pull-request/pull-request-layout'
import PullRequestListPage from './pages-v2/pull-request/pull-request-list'
import { RepoLabelFormContainer } from './pages-v2/repo/labels/label-form-container.tsx'
import { RepoLabelFormContainer } from './pages-v2/repo/labels/label-form-container'
import { RepoLabelsList } from './pages-v2/repo/labels/labels-list-container'
import { RepoBranchesListPage } from './pages-v2/repo/repo-branch-list'
import { RepoBranchSettingsRulesPageContainer } from './pages-v2/repo/repo-branch-rules-container'
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/components/multi-select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const MultiSelect = <T = unknown,>({
</Label>
)}
<DropdownMenu.Root>
<DropdownMenu.Trigger className="flex h-9 w-full items-center justify-between rounded border border-borders-2 px-3 transition-colors data-[state=open]:border-borders-8 bg-input-background">
<DropdownMenu.Trigger className="flex h-9 w-full items-center justify-between rounded border border-borders-2 bg-input-background px-3 transition-colors data-[state=open]:border-borders-8">
{placeholder}
<Icon name="chevron-down" className="chevron-down ml-auto" size={12} />
</DropdownMenu.Trigger>
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/components/tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ const tabsTriggerVariants = cva(
underline:
'm-0 h-11 border-b-2 border-solid border-b-transparent px-0 font-normal data-[state=active]:border-primary',
navigation:
'm-0 my-1 h-9 px-0 font-normal text-foreground-2 duration-150 ease-in-out after:absolute after:inset-[-0.25rem_0] after:block after:border-b after:border-solid after:border-b-transparent hover:text-foreground-1 data-[state=active]:after:border-borders-9',
'm-0 my-1 h-9 px-0 text-14 font-normal leading-none text-foreground-2 duration-150 ease-in-out after:absolute after:inset-[-0.25rem_0] after:block after:border-b after:border-solid after:border-b-transparent hover:text-foreground-1 data-[state=active]:after:border-borders-9',
tabnav:
'h-9 rounded-t-md border-x border-t border-transparent px-4 font-normal text-foreground-2 hover:text-foreground-1 data-[state=active]:border-borders-1 data-[state=active]:bg-background-1 data-[state=active]:text-foreground-1'
'h-9 rounded-t-md border-x border-t border-transparent px-4 font-normal text-foreground-2 hover:text-foreground-1 data-[state=active]:border-borders-1 data-[state=active]:bg-background-1'
}
},
defaultVariants: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const BranchSelector: FC<BranchSelectorProps> = ({
<DropdownMenu.Root>
<DropdownMenu.Trigger asChild>
<Button
className="flex items-center gap-1.5 overflow-hidden px-3 data-[state=open]:border-borders-9 bg-input-background"
className="flex items-center gap-1.5 overflow-hidden bg-input-background px-3 data-[state=open]:border-borders-9"
variant="outline"
size={buttonSize}
>
Expand Down

0 comments on commit 76ceae8

Please sign in to comment.