Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(cosmetic): cannot find m-r-10 class in superset.less #20276

Merged
merged 6 commits into from
Jun 17, 2022
Merged

fix(cosmetic): cannot find m-r-10 class in superset.less #20276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
12262cd
fix(cosmetic): cannot find m-r-10 class in superset.less
Renderz Jun 6, 2022
c072ba3
Merge branch 'apache:master' into pr-fix-superset-less-class
Renderz Jun 15, 2022
97b971d
fix: remove .m-r-10 class and use emotion instead
Renderz Jun 15, 2022
0f18961
Merge branch 'pr-fix-superset-less-class' of github.com:Renderz/super…
Renderz Jun 15, 2022
8d11d4e
Update superset-frontend/src/components/Datasource/CollectionTable.tsx
Renderz Jun 17, 2022
fdbf0d7
Update superset-frontend/src/components/Datasource/DatasourceEditor.jsx
Renderz Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions superset-frontend/src/components/Datasource/CollectionTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,13 @@ const CrudButtonWrapper = styled.div`
${({ theme }) => `margin-bottom: ${theme.gridUnit * 2}px`}
`;

const StyledButtonWrapper = styled.span`
${({ theme }) => `
margin-top: ${theme.gridUnit * 3}px;
margin-left: ${theme.gridUnit * 3}px;
`}
`;

export default class CRUDCollection extends React.PureComponent<
CRUDCollectionProps,
CRUDCollectionState
Expand Down Expand Up @@ -424,7 +431,7 @@ export default class CRUDCollection extends React.PureComponent<
<>
<CrudButtonWrapper>
{this.props.allowAddItem && (
<span className="m-t-10 m-r-10">
<StyledButtonWrapper>
<Button
buttonSize="small"
buttonStyle="tertiary"
Expand All @@ -434,7 +441,7 @@ export default class CRUDCollection extends React.PureComponent<
<i data-test="crud-add-table-item" className="fa fa-plus" />{' '}
{t('Add item')}
</Button>
</span>
</StyledButtonWrapper>
)}
</CrudButtonWrapper>
<CrudTableWrapper
Expand Down
11 changes: 9 additions & 2 deletions superset-frontend/src/components/Datasource/DatasourceEditor.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,13 @@ const StyledColumnsTabWrapper = styled.div`
}
`;

const StyledButtonWrapper = styled.span`
${({ theme }) => `
margin-top: ${theme.gridUnit * 3}px;
margin-left: ${theme.gridUnit * 3}px;
`}
`;

const checkboxGenerator = (d, onChange) => (
<CheckboxControl value={d} onChange={onChange} />
);
Expand Down Expand Up @@ -1358,7 +1365,7 @@ class DatasourceEditor extends React.PureComponent {
>
<StyledColumnsTabWrapper>
<ColumnButtonWrapper>
<span className="m-t-10 m-r-10">
<StyledButtonWrapper>
<Button
buttonSize="small"
buttonStyle="tertiary"
Expand All @@ -1369,7 +1376,7 @@ class DatasourceEditor extends React.PureComponent {
<i className="fa fa-database" />{' '}
{t('Sync columns from source')}
</Button>
</span>
</StyledButtonWrapper>
</ColumnButtonWrapper>
<ColumnCollectionTable
className="columns-table"
Expand Down