Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

moderate component fixes #3095

Merged
merged 5 commits into from
Nov 12, 2024
+7 −8
Merged

moderate component fixes #3095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5dcc369
moderate component fixes
pablodanswer Nov 9, 2024
2d9586b
nit
pablodanswer Nov 9, 2024
a287cd9
nit
pablodanswer Nov 9, 2024
5dfcb94
update colors
pablodanswer Nov 9, 2024
bfcd418
k
pablodanswer Nov 9, 2024
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
7 changes: 3 additions & 4 deletions web/src/app/admin/indexing/status/CCPairIndexingStatusTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,9 @@ function ConnectorRow({
return (
<TableRow
className={`hover:bg-hover-light ${
invisible ? "invisible !h-0 !-mb-10" : "!border !border-border"
invisible
? "invisible !h-0 !-mb-10 !border-none"
: "!border !border-border"
} w-full cursor-pointer relative `}
onClick={() => {
router.push(`/admin/connector/${ccPairsIndexingStatus.cc_pair_id}`);
Expand Down Expand Up @@ -434,7 +436,6 @@ export function CCPairIndexingStatusTable({
{!shouldExpand ? "Collapse All" : "Expand All"}
</Button>
</div>

<TableBody>
{sortedSources
.filter(
Expand All @@ -454,14 +455,12 @@ export function CCPairIndexingStatusTable({
return (
<React.Fragment key={ind}>
<br className="mt-4" />

<SummaryRow
source={source}
summary={groupSummaries[source]}
isOpen={connectorsToggled[source] || false}
onToggle={() => toggleSource(source)}
/>

{connectorsToggled[source] && (
<>
<TableRow className="border border-border">
Expand Down
2 changes: 1 addition & 1 deletion web/src/app/admin/users/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ const AddUserButton = ({
};
return (
<>
<Button className="w-fit" onClick={() => setModal(true)}>
<Button className="my-auto w-fit" onClick={() => setModal(true)}>
<div className="flex">
<FiPlusSquare className="my-auto mr-2" />
Invite Users
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/admin/ClientLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ export function ClientLayout({
<div className="fixed bg-background left-0 gap-x-4 mb-8 px-4 py-2 w-full items-center flex justify-end">
<UserDropdown />
</div>
<div className="pt-20 flex overflow-y-auto h-full px-4 md:px-12">
<div className="pt-20 flex overflow-y-auto overflow-x-hidden h-full px-4 md:px-12">
{children}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions web/src/components/ui/button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const buttonVariants = cva(
success:
"bg-green-100 text-green-600 hover:bg-green-500/90 dark:bg-blue-500 dark:text-neutral-50 dark:hover:bg-green-900/90",
"success-reverse":
"bg-green-500 text-white hover:bg-green-600/90 dark:bg-neutral-50 dark:text-blue-500 dark:hover:bg-green-100/90",
"bg-green-500 text-inverted hover:bg-green-600/90 dark:bg-neutral-50 dark:text-blue-500 dark:hover:bg-green-100/90",

default:
"bg-neutral-900 border-border text-neutral-50 hover:bg-neutral-900/90 dark:bg-neutral-50 dark:text-neutral-900 dark:hover:bg-neutral-50/90",
Expand All @@ -38,7 +38,7 @@ const buttonVariants = cva(
"link-reverse":
"text-neutral-50 underline-offset-4 hover:underline dark:text-neutral-900",
submit:
"bg-green-500 text-green-100 hover:bg-green-600/90 dark:bg-neutral-50 dark:text-blue-500 dark:hover:bg-green-100/90",
"bg-green-500 text-inverted hover:bg-green-600/90 dark:bg-neutral-50 dark:text-blue-500 dark:hover:bg-green-100/90",

// "bg-blue-600 text-neutral-50 hover:bg-blue-600/80 dark:bg-blue-600 dark:text-neutral-50 dark:hover:bg-blue-600/90",
"submit-reverse":
Expand Down
Loading