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

Filter edit icon component replaced with Font Awesome #8600

Merged
merged 8 commits into from
Nov 27, 2019
Merged

Filter edit icon component replaced with Font Awesome #8600

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5edc383
replaced!
rusackas Nov 19, 2019
26dcb77
added role to the FA image/button
rusackas Nov 19, 2019
db795de
adding tabindex.
rusackas Nov 19, 2019
4e560fe
capitalization of tabIndex matters. I'll have another cup of coffee now.
rusackas Nov 19, 2019
85f8797
added newine at end of file, added stylelint rule to track this.
rusackas Nov 19, 2019
cf57c71
Merge branch 'master' into filter-edit-with-font-awesome
rusackas Nov 20, 2019
aaabb27
Merge branch 'master' into filter-edit-with-font-awesome
rusackas Nov 27, 2019
c183d58
re-removing these files after merge conflict resolution.
rusackas Nov 27, 2019
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
3 changes: 2 additions & 1 deletion superset/assets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,8 @@
},
"stylelint": {
"rules": {
"block-opening-brace-space-before": "always"
"block-opening-brace-space-before": "always",
"no-missing-end-of-source-newline": "never"
}
}
}
21 changes: 0 additions & 21 deletions superset/assets/src/components/FilterEditIcon.css
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions superset/assets/src/components/FilterEditIcon.jsx
View file
Open in desktop

This file was deleted.

9 changes: 6 additions & 3 deletions superset/assets/src/dashboard/components/FilterIndicatorTooltip.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ import PropTypes from 'prop-types';
import { t } from '@superset-ui/translation';
import { isEmpty } from 'lodash';

import FilterEditIcon from '../../components/FilterEditIcon';

const propTypes = {
label: PropTypes.string.isRequired,
values: PropTypes.array.isRequired,
Expand All @@ -48,7 +46,12 @@ export default function FilterIndicatorTooltip({
</div>

{clickIconHandler && (
<FilterEditIcon clickIconHandler={clickIconHandler} />
<i
className="fa fa-pencil filter-edit"
onClick={clickIconHandler}
role="button"
tabIndex="0"
/>
)}
</div>
);
Expand Down
1 change: 1 addition & 0 deletions superset/assets/src/dashboard/stylesheets/filter-indicator-tooltip.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
}

.filter-edit {
cursor: pointer;
position: absolute;
top: 4px;
right: 0;
Expand Down