External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 11:00:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into use-styled-components

Browse Source
This commit is contained in:
Kia Lam 2019-05-14 10:20:25 -04:00
commit cc24d524ac
No known key found for this signature in database
GPG Key ID: 294F9BE53C241D03
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/DataListToolbar/DataListToolbar.jsx
View File

@ -125,11 +125,9 @@ class DataListToolbar extends React.Component {
sortedColumnKey={sortedColumnKey}
/>
</ToolbarItem>
{ (showExpandCollapse || additionalControls.length) ? (
<VerticalSeparator />
) : null}
{showExpandCollapse && (
<Fragment>
<VerticalSeparator />
<ToolbarGroup>
<ExpandCollapse
isCompact={isCompact}

5
src/components/Search/Search.jsx
View File

@ -10,8 +10,9 @@ import {
DropdownItem,
TextInput as PFTextInput
} from '@patternfly/react-core';
import { SearchIcon } from '@patternfly/react-icons';
import {
SearchIcon
} from '@patternfly/react-icons';
import styled from 'styled-components';