diff --git a/src/app.scss b/src/app.scss index 35c266786b..871d253a28 100644 --- a/src/app.scss +++ b/src/app.scss @@ -100,8 +100,16 @@ --pf-c-data-list__cell--PaddingBottom: 16px; --pf-c-data-list__cell-cell--PaddingTop: 16px; - a { - margin-right: 8px; + .awx-c-list-group { + display: inline-flex; + margin-right: 20px; + + &--badge { + align-items: center; + display: flex; + justify-content: center; + margin-left: 10px; + } } } @@ -224,18 +232,12 @@ border-bottom: 1px solid #d7d7d7; } -.at-c-listCardBody { - --pf-c-card__footer--PaddingX: 0; - --pf-c-card__footer--PaddingY: 0; - --pf-c-card__body--PaddingX: 0; - --pf-c-card__body--PaddingY: 0; -} - - .awx-c-card { position: relative; } + + // PF Alert notification component overrides .pf-c-alert__title { --pf-c-alert__title--PaddingTop: 20px; diff --git a/src/pages/Organizations/components/OrganizationListItem.jsx b/src/pages/Organizations/components/OrganizationListItem.jsx index 4a8309ba11..d304f6743d 100644 --- a/src/pages/Organizations/components/OrganizationListItem.jsx +++ b/src/pages/Organizations/components/OrganizationListItem.jsx @@ -16,7 +16,7 @@ class OrganizationListItem extends React.Component { const { itemId, name, - userCount, + memberCount, teamCount, isSelected, onSelect, @@ -45,22 +45,18 @@ class OrganizationListItem extends React.Component {
- - Users - - - {' '} - {userCount} - {' '} - - + + Members + + {memberCount} + + + Teams - - - {' '} - {teamCount} - {' '} - + + {teamCount} + +
@@ -68,4 +64,3 @@ class OrganizationListItem extends React.Component { } } export default OrganizationListItem; - diff --git a/src/pages/Organizations/screens/OrganizationsList.jsx b/src/pages/Organizations/screens/OrganizationsList.jsx index f40d572cc2..8b38d8fe95 100644 --- a/src/pages/Organizations/screens/OrganizationsList.jsx +++ b/src/pages/Organizations/screens/OrganizationsList.jsx @@ -355,7 +355,7 @@ class OrganizationsList extends Component { itemId={o.id} name={o.name} detailUrl={`${match.url}/${o.id}`} - userCount={o.summary_fields.related_field_counts.users} + memberCount={o.summary_fields.related_field_counts.users} teamCount={o.summary_fields.related_field_counts.teams} isSelected={selected.includes(o.id)} onSelect={() => this.onSelect(o.id, o.name)}