External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-20 18:37:39 -02: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
parent 457c6287a2 0b3245eab6
commit cc24d524ac
2 changed files with 4 additions and 5 deletions
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} sortedColumnKey={sortedColumnKey}
/> />
</ToolbarItem> </ToolbarItem>
{ (showExpandCollapse || additionalControls.length) ? (
<VerticalSeparator />
) : null}
{showExpandCollapse && ( {showExpandCollapse && (
<Fragment> <Fragment>
<VerticalSeparator />
<ToolbarGroup> <ToolbarGroup>
<ExpandCollapse <ExpandCollapse
isCompact={isCompact} isCompact={isCompact}

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

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