From 781869a43658205a6b24f3e26a9db7fba2a1396e Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Wed, 10 Jun 2020 13:02:38 -0400 Subject: [PATCH] adjust styled components for data toolbar overrides with new pf v4 names --- .../src/components/DataListToolbar/DataListToolbar.jsx | 9 --------- awx/ui_next/src/components/OptionsList/OptionsList.jsx | 2 +- awx/ui_next/src/components/Wizard/Wizard.jsx | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx index 76e2652a8b..4f804ba966 100644 --- a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx +++ b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.jsx @@ -10,7 +10,6 @@ import { ToolbarItem, ToolbarToggleGroup, } from '@patternfly/react-core'; -import styled from 'styled-components'; import { SearchIcon } from '@patternfly/react-icons'; import ExpandCollapse from '../ExpandCollapse'; import Search from '../Search'; @@ -18,14 +17,6 @@ import Sort from '../Sort'; import { SearchColumns, SortColumns, QSConfig } from '../../types'; -const ToolbarContent = styled(_ToolbarContent)` - --pf-c-data-toolbar__content--PaddingLeft: 24px; - --pf-c-data-toolbar__content--PaddingRight: 8px; -`; -const ToolbarGroup = styled(_ToolbarGroup)` - --pf-c-data-toolbar__group--spacer: 24px; -`; - class DataListToolbar extends React.Component { render() { const { diff --git a/awx/ui_next/src/components/OptionsList/OptionsList.jsx b/awx/ui_next/src/components/OptionsList/OptionsList.jsx index ea106acbf8..3ff42f9f71 100644 --- a/awx/ui_next/src/components/OptionsList/OptionsList.jsx +++ b/awx/ui_next/src/components/OptionsList/OptionsList.jsx @@ -18,7 +18,7 @@ import DataListToolbar from '../DataListToolbar'; import { QSConfig, SearchColumns, SortColumns } from '../../types'; const ModalList = styled.div` - .pf-c-data-toolbar__content { + .pf-c-toolbar__content { padding: 0 !important; } `; diff --git a/awx/ui_next/src/components/Wizard/Wizard.jsx b/awx/ui_next/src/components/Wizard/Wizard.jsx index 99e884baad..9f737d7691 100644 --- a/awx/ui_next/src/components/Wizard/Wizard.jsx +++ b/awx/ui_next/src/components/Wizard/Wizard.jsx @@ -3,7 +3,7 @@ import styled from 'styled-components'; Wizard.displayName = 'PFWizard'; export default styled(Wizard)` - .pf-c-data-toolbar__content { + .pf-c-toolbar__content { padding: 0 !important; } `;