Skip to content

Commit

Permalink
fix list colors
Browse files Browse the repository at this point in the history
  • Loading branch information
maciaszczykm committed Oct 18, 2024
1 parent f641cea commit 4ba3ef4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ export function EditPluralOIDCClientModal({
onClose,
instanceName,
provider,
useModalOverlay = true,
insideModal = false,
}: {
open: boolean
onClose: () => void
instanceName: string
provider?: OidcProviderFragment
useModalOverlay?: boolean
insideModal?: boolean
}) {
return (
<Modal
open={open}
onClose={onClose}
overlayStyles={{ background: useModalOverlay ? undefined : 'none' }}
overlayStyles={{ background: insideModal ? 'none' : undefined }}
header={`${instanceName} - Edit Plural OIDC clients`}
size="large"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export function EditPluralOIDCClientsModal({
>
<EditPluralOIDCClients
instanceName={instance.name}
useModalOverlay={false}
insideModal
/>
</ImpersonateServiceAccount>
<Button
Expand All @@ -72,7 +72,7 @@ export function EditPluralOIDCClientsModal({

type TableMetaT = {
instanceName: string
useModalOverlay?: boolean
insideModal?: boolean
}

const columnHelper = createColumnHelper<OidcProviderFragment>()
Expand Down Expand Up @@ -110,7 +110,7 @@ const columns = [
meta: { gridTemplate: 'max-content' },
cell: function Cell({ row: { original: provider }, table }) {
const [editOpen, setEditOpen] = useState(false)
const { instanceName, useModalOverlay } = table.options.meta as TableMetaT
const { instanceName, insideModal } = table.options.meta as TableMetaT

return (
<>
Expand All @@ -123,7 +123,7 @@ const columns = [
open={editOpen}
onClose={() => setEditOpen(false)}
instanceName={instanceName}
useModalOverlay={useModalOverlay}
insideModal={insideModal}
provider={provider}
/>
</>
Expand All @@ -134,10 +134,10 @@ const columns = [

export function EditPluralOIDCClients({
instanceName,
useModalOverlay = true,
insideModal = false,
}: {
instanceName: string
useModalOverlay?: boolean
insideModal?: boolean
}) {
const theme = useTheme()
const [createOpen, setCreateOpen] = useState(false)
Expand Down Expand Up @@ -183,7 +183,7 @@ export function EditPluralOIDCClients({
onVirtualSliceChange={setVirtualSlice}
reactVirtualOptions={DEFAULT_REACT_VIRTUAL_OPTIONS}
reactTableOptions={{
meta: { instanceName, useModalOverlay } as TableMetaT,
meta: { instanceName, insideModal } as TableMetaT,
}}
style={{
border: 'none',
Expand All @@ -192,7 +192,8 @@ export function EditPluralOIDCClients({
}}
css={{
td: {
backgroundColor: theme.colors['fill-one'],
backgroundColor:
theme.colors[insideModal ? 'fill-two' : 'fill-one'],
borderColor: theme.colors['border-fill-two'],
},
}}
Expand All @@ -202,7 +203,7 @@ export function EditPluralOIDCClients({
onClick={() => setCreateOpen(true)}
css={{
...theme.partials.text.body2Bold,
backgroundColor: theme.colors['fill-two'],
backgroundColor: theme.colors[insideModal ? 'fill-one' : 'fill-zero'],
alignItems: 'center',
borderTop: theme.borders['fill-two'],
display: 'flex',
Expand All @@ -214,7 +215,8 @@ export function EditPluralOIDCClients({
left: 0,

'&:hover': {
backgroundColor: theme.colors['fill-one-hover'],
backgroundColor:
theme.colors[insideModal ? 'fill-one-hover' : 'fill-zero-hover'],
cursor: 'pointer',
},
}}
Expand All @@ -226,7 +228,7 @@ export function EditPluralOIDCClients({
open={createOpen}
onClose={() => setCreateOpen(false)}
instanceName={instanceName}
useModalOverlay={useModalOverlay}
insideModal={insideModal}
/>
</div>
)
Expand Down

0 comments on commit 4ba3ef4

Please sign in to comment.