Skip to content

Commit

Permalink
fix: Manage members layout is broken (#3058)
Browse files Browse the repository at this point in the history
  • Loading branch information
@novakzaballa
novakzaballa authored Dec 5, 2023
1 parent 6bf968e commit d129397
Showing 1 changed file with 21 additions and 12 deletions.
33 changes: 21 additions & 12 deletions frontend/web/components/pages/OrganisationSettingsPage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import PageTitle from 'components/PageTitle'
import { getStore } from 'common/store'
import { getRoles } from 'common/services/useRole'

const widths = [450, 150, 100]
const widths = [450, 255, 250, 235, 150, 100]
const rolesWidths = [250, 600, 100]
const OrganisationSettingsPage = class extends Component {
static contextTypes = {
Expand Down Expand Up @@ -955,23 +955,28 @@ const OrganisationSettingsPage = class extends Component {
<Flex className='table-column px-3'>
User
</Flex>
<Flex className='table-column'>
<Flex
className='table-column'
style={{
minWidth: widths[1],
}}
>
Role
</Flex>
<div
style={{ width: widths[0] }}
style={{ width: widths[2] }}
className='table-column'
>
Action
</div>
<div
style={{ width: widths[1] }}
style={{ width: widths[4] }}
className='table-column'
>
Last logged in
</div>
<div
style={{ width: widths[2] }}
style={{ width: widths[5] }}
className='table-column text-center'
>
Remove
Expand Down Expand Up @@ -1021,7 +1026,11 @@ const OrganisationSettingsPage = class extends Component {
</Flex>

<Flex className='table-column'>
<div>
<div
style={{
minWidth: widths[3],
}}
>
{organisation.role ===
'ADMIN' &&
id !==
Expand Down Expand Up @@ -1095,7 +1104,7 @@ const OrganisationSettingsPage = class extends Component {
{role !== 'ADMIN' ? (
<div
style={{
width: widths[0],
width: widths[2],
}}
onClick={onEditClick}
className='table-column'
Expand All @@ -1115,13 +1124,13 @@ const OrganisationSettingsPage = class extends Component {
) : (
<div
style={{
width: widths[0],
width: widths[2],
}}
></div>
)}
<div
style={{
width: widths[1],
width: widths[4],
}}
className='table-column'
>
Expand All @@ -1133,7 +1142,7 @@ const OrganisationSettingsPage = class extends Component {
</div>
<div
style={{
width: widths[2],
width: widths[5],
}}
className='table-column text-center'
>
Expand Down Expand Up @@ -1213,7 +1222,7 @@ const OrganisationSettingsPage = class extends Component {
</div>
<div
style={{
width: widths[2],
width: widths[5],
}}
className='table-column text-center'
>
Expand Down Expand Up @@ -1280,7 +1289,7 @@ const OrganisationSettingsPage = class extends Component {
<div
className='table-column text-center'
style={{
width: widths[2],
width: widths[5],
}}
>
<Button
Expand Down

3 comments on commit d129397

@vercel
Copy link

@vercel vercel bot commented on d129397 Dec 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

flagsmith-frontend-staging – ./frontend

flagsmith-staging-frontend.vercel.app
flagsmith-frontend-staging-git-main-flagsmith.vercel.app
flagsmith-frontend-staging-flagsmith.vercel.app
staging.flagsmith.com

@vercel
Copy link

@vercel vercel bot commented on d129397 Dec 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

docs – ./docs

docs.flagsmith.com
docs-flagsmith.vercel.app
docs-git-main-flagsmith.vercel.app
docs.bullet-train.io

@vercel
Copy link

@vercel vercel bot commented on d129397 Dec 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

flagsmith-frontend-preview – ./frontend

flagsmith-frontend-preview-git-main-flagsmith.vercel.app
flagsmith-frontend-production-native.vercel.app
flagsmith-frontend-preview-flagsmith.vercel.app

Please sign in to comment.