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

Plotly modebar appears above modals #3799

Merged
merged 2 commits into from
May 15, 2019
Merged

Plotly modebar appears above modals #3799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f91dde
getredash/redash#3785 Plotly modebar appears above modals - fixed z-i…
kravets-levko May 14, 2019
3cfb1b9
Fix Help drawer z-index
kravets-levko May 14, 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
21 changes: 17 additions & 4 deletions client/app/assets/less/ant.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,22 @@
@import "~antd/lib/notification/style/index";
@import 'inc/ant-variables';

// Increase z-indexes to avoid conflicts with some other libraries (e.g. Plotly)
@zindex-modal: 2000;
@zindex-modal-mask: 2000;
@zindex-message: 2010;
@zindex-notification: 2010;
@zindex-popover: 2030;
@zindex-dropdown: 2050;
@zindex-picker: 2050;
@zindex-tooltip: 2060;

.@{drawer-prefix-cls} {
&.help-drawer {
z-index: 3000; // help drawer should be topmost
}
}

// Remove bold in labels for Ant checkboxes and radio buttons
.ant-checkbox-wrapper,
.ant-radio-wrapper {
Expand All @@ -59,6 +75,7 @@
}

// Fix for Ant dropdowns when they are used in Boootstrap modals
// ANGULAR_REMOVE_ME Remove when all dialogs will be migrated to React (also search and remove usages)
.ant-dropdown-in-bootstrap-modal {
z-index: 1050;
}
Expand Down Expand Up @@ -288,10 +305,6 @@
margin-top: 4px;
}

.ant-popover {
z-index: 1000; // make sure it doesn't cover drawer
}

// Notification overrides
.@{notification-prefix-cls} {
// vertical centering
Expand Down
1 change: 0 additions & 1 deletion client/app/components/dashboards/AddWidgetDialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ class AddWidgetDialog extends React.Component {
className="w-100"
defaultValue={first(this.state.selectedQuery.visualizations).id}
onChange={visualizationId => this.selectVisualization(this.state.selectedQuery, visualizationId)}
dropdownClassName="ant-dropdown-in-bootstrap-modal"
>
{visualizationGroups.map(visualizations => (
<OptGroup label={visualizations[0].type} key={visualizations[0].type}>
Expand Down