From 71ace1bc0003dd3de995243becdc733bd2e4d274 Mon Sep 17 00:00:00 2001 From: mabashian Date: Wed, 12 Dec 2018 10:40:51 -0500 Subject: [PATCH] Small ux changes on the org list based on feedback --- .../DataListToolbar/DataListToolbar.jsx | 29 ++++++++----------- src/components/DataListToolbar/styles.scss | 17 +++++++---- .../components/OrganizationListItem.jsx | 2 +- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/components/DataListToolbar/DataListToolbar.jsx b/src/components/DataListToolbar/DataListToolbar.jsx index c48d855dd7..80b238be6e 100644 --- a/src/components/DataListToolbar/DataListToolbar.jsx +++ b/src/components/DataListToolbar/DataListToolbar.jsx @@ -23,6 +23,7 @@ import { SortNumericDownIcon, SortNumericUpIcon, TrashAltIcon, + PlusIcon } from '@patternfly/react-icons'; import { Link @@ -114,6 +115,12 @@ class DataListToolbar extends React.Component { return icon; }; + const dropdownItems = columns.filter(({ key }) => key !== searchKey).map(({ key, name }) => ( + + { name } + + )); + return ( {({ i18n }) => ( @@ -146,13 +153,8 @@ class DataListToolbar extends React.Component { { searchColumnName } )} - > - {columns.filter(({ key }) => key !== searchKey).map(({ key, name }) => ( - - { name } - - ))} - + dropdownItems={dropdownItems} + /> )} - > - {columns - .filter(({ key, isSortable }) => isSortable && key !== sortedColumnKey) - .map(({ key, name }) => ( - - { name } - - ))} - + dropdownItems={dropdownItems} + /> )} diff --git a/src/components/DataListToolbar/styles.scss b/src/components/DataListToolbar/styles.scss index 66fd6f0902..1258225f31 100644 --- a/src/components/DataListToolbar/styles.scss +++ b/src/components/DataListToolbar/styles.scss @@ -33,7 +33,7 @@ margin-right: 20px; } -.awx-toolbar button { +.awx-toolbar button.pf-c-button { height: 30px; padding: 0px; } @@ -43,7 +43,7 @@ height: 30px; input { - padding: 0px; + padding: 0 10px; width: 300px; } @@ -57,7 +57,7 @@ min-height: 30px; min-width: 70px; height: 30px; - padding: 0px; + padding: 0 10px; margin: 0px; .pf-c-dropdown__toggle-icon { @@ -74,16 +74,23 @@ .awx-toolbar .pf-c-button.pf-m-primary { background-color: #5cb85c; min-width: 0px; - width: 58px; + width: 30px; height: 30px; text-align: center; - padding: 0px; margin: 0px; margin-right: 20px; margin-left: 20px; + border-radius: 50%; } .awx-toolbar .pf-l-toolbar__item .pf-c-button.pf-m-plain { 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; +// } +} diff --git a/src/pages/Organizations/components/OrganizationListItem.jsx b/src/pages/Organizations/components/OrganizationListItem.jsx index da2a2ef2cd..d28f158126 100644 --- a/src/pages/Organizations/components/OrganizationListItem.jsx +++ b/src/pages/Organizations/components/OrganizationListItem.jsx @@ -41,7 +41,7 @@ export default ({ state: { breadcrumb: [parentBreadcrumb, { name, url: detailUrl }] } }} > - {name} + {name}