Small ux changes on the org list based on feedback

This commit is contained in:
mabashian
2018-12-12 10:40:51 -05:00
parent b375963165
commit 71ace1bc00
3 changed files with 25 additions and 23 deletions

View File

@@ -23,6 +23,7 @@ import {
SortNumericDownIcon, SortNumericDownIcon,
SortNumericUpIcon, SortNumericUpIcon,
TrashAltIcon, TrashAltIcon,
PlusIcon
} from '@patternfly/react-icons'; } from '@patternfly/react-icons';
import { import {
Link Link
@@ -114,6 +115,12 @@ class DataListToolbar extends React.Component {
return icon; return icon;
}; };
const dropdownItems = columns.filter(({ key }) => key !== searchKey).map(({ key, name }) => (
<DropdownItem key={key} component="button">
{ name }
</DropdownItem>
));
return ( return (
<I18n> <I18n>
{({ i18n }) => ( {({ i18n }) => (
@@ -146,13 +153,8 @@ class DataListToolbar extends React.Component {
{ searchColumnName } { searchColumnName }
</DropdownToggle> </DropdownToggle>
)} )}
> dropdownItems={dropdownItems}
{columns.filter(({ key }) => key !== searchKey).map(({ key, name }) => ( />
<DropdownItem key={key} component="button">
{ name }
</DropdownItem>
))}
</Dropdown>
<TextInput <TextInput
type="search" type="search"
aria-label={i18n._(t`Search text input`)} aria-label={i18n._(t`Search text input`)}
@@ -183,15 +185,8 @@ class DataListToolbar extends React.Component {
{ sortedColumnName } { sortedColumnName }
</DropdownToggle> </DropdownToggle>
)} )}
> dropdownItems={dropdownItems}
{columns />
.filter(({ key, isSortable }) => isSortable && key !== sortedColumnKey)
.map(({ key, name }) => (
<DropdownItem key={key} component="button">
{ name }
</DropdownItem>
))}
</Dropdown>
</ToolbarItem> </ToolbarItem>
<ToolbarItem> <ToolbarItem>
<Button <Button
@@ -228,7 +223,7 @@ class DataListToolbar extends React.Component {
{addUrl && ( {addUrl && (
<Link to={addUrl}> <Link to={addUrl}>
<Button variant="primary" aria-label={i18n._(t`Add`)}> <Button variant="primary" aria-label={i18n._(t`Add`)}>
<Trans>Add</Trans> <PlusIcon />
</Button> </Button>
</Link> </Link>
)} )}

View File

@@ -33,7 +33,7 @@
margin-right: 20px; margin-right: 20px;
} }
.awx-toolbar button { .awx-toolbar button.pf-c-button {
height: 30px; height: 30px;
padding: 0px; padding: 0px;
} }
@@ -43,7 +43,7 @@
height: 30px; height: 30px;
input { input {
padding: 0px; padding: 0 10px;
width: 300px; width: 300px;
} }
@@ -57,7 +57,7 @@
min-height: 30px; min-height: 30px;
min-width: 70px; min-width: 70px;
height: 30px; height: 30px;
padding: 0px; padding: 0 10px;
margin: 0px; margin: 0px;
.pf-c-dropdown__toggle-icon { .pf-c-dropdown__toggle-icon {
@@ -74,16 +74,23 @@
.awx-toolbar .pf-c-button.pf-m-primary { .awx-toolbar .pf-c-button.pf-m-primary {
background-color: #5cb85c; background-color: #5cb85c;
min-width: 0px; min-width: 0px;
width: 58px; width: 30px;
height: 30px; height: 30px;
text-align: center; text-align: center;
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
margin-right: 20px; margin-right: 20px;
margin-left: 20px; margin-left: 20px;
border-radius: 50%;
} }
.awx-toolbar .pf-l-toolbar__item .pf-c-button.pf-m-plain { .awx-toolbar .pf-l-toolbar__item .pf-c-button.pf-m-plain {
font-size: 18px; font-size: 18px;
} }
.awx-toolbar .pf-l-toolbar__item .pf-c-button.pf-m-plain :nth-of-type(2) {
// .awx-toolbar .pf-l-toolbar__item:nth-of-type(2) {
// .pf-c-button.pf-m-plain {
font-size: 22px;
// }
}

View File

@@ -41,7 +41,7 @@ export default ({
state: { breadcrumb: [parentBreadcrumb, { name, url: detailUrl }] } state: { breadcrumb: [parentBreadcrumb, { name, url: detailUrl }] }
}} }}
> >
{name} <b>{name}</b>
</Link> </Link>
</span> </span>
</div> </div>