problems: fix ack tooltip styles for alert list

This commit is contained in:
Alexander Zobnin
2019-01-15 18:52:26 +03:00
parent 79e4ec884a
commit 74ea451da9
4 changed files with 18 additions and 27 deletions

View File

@@ -284,7 +284,7 @@ class AlertAcknowledgesButton extends PureComponent<AlertAcknowledgesButtonProps
const { problem } = this.props; const { problem } = this.props;
return ( return (
problem.acknowledges && problem.acknowledges.length ? problem.acknowledges && problem.acknowledges.length ?
<Tooltip placement="bottom" content={this.renderTooltipContent}> <Tooltip placement="bottom" popperClassName="ack-tooltip" content={this.renderTooltipContent}>
<span><i className="fa fa-comments"></i></span> <span><i className="fa fa-comments"></i></span>
</Tooltip> : </Tooltip> :
<Tooltip placement="bottom" content="Acknowledge problem"> <Tooltip placement="bottom" content="Acknowledge problem">
@@ -316,12 +316,7 @@ class AlertAcknowledges extends PureComponent<AlertAcknowledgesProps> {
); );
}); });
return ( return (
<div> <div className="ack-tooltip">
<div className="ack-add-button">
<button id="add-acknowledge-btn" className="btn btn-mini btn-inverse gf-form-button" onClick={this.handleClick}>
<i className="fa fa-plus"></i>
</button>
</div>
<table className="table"> <table className="table">
<thead> <thead>
<tr> <tr>
@@ -334,6 +329,11 @@ class AlertAcknowledges extends PureComponent<AlertAcknowledgesProps> {
{ackRows} {ackRows}
</tbody> </tbody>
</table> </table>
<div className="ack-add-button">
<button id="add-acknowledge-btn" className="btn btn-mini btn-inverse gf-form-button" onClick={this.handleClick}>
<i className="fa fa-plus"></i>
</button>
</div>
</div> </div>
); );
} }

View File

@@ -1,4 +1,5 @@
import React, { PureComponent } from 'react'; import React, { PureComponent } from 'react';
import classNames from 'classnames';
import BodyPortal from './Portal'; import BodyPortal from './Portal';
import { Manager, Popper as ReactPopper, Reference } from 'react-popper'; import { Manager, Popper as ReactPopper, Reference } from 'react-popper';
import Transition from 'react-transition-group/Transition'; import Transition from 'react-transition-group/Transition';
@@ -21,12 +22,14 @@ interface Props {
placement?: any; placement?: any;
content: string | ((props: any) => JSX.Element); content: string | ((props: any) => JSX.Element);
refClassName?: string; refClassName?: string;
popperClassName?: string;
} }
class Popper extends PureComponent<Props> { class Popper extends PureComponent<Props> {
render() { render() {
const { children, renderContent, show, placement, refClassName } = this.props; const { children, renderContent, show, placement, refClassName } = this.props;
const { content } = this.props; const { content } = this.props;
const popperClassName = classNames('popper', this.props.popperClassName);
return ( return (
<Manager> <Manager>
@@ -51,7 +54,7 @@ class Popper extends PureComponent<Props> {
...transitionStyles[transitionState], ...transitionStyles[transitionState],
}} }}
data-placement={placement} data-placement={placement}
className="popper" className={popperClassName}
> >
<div className="popper__background"> <div className="popper__background">
{renderContent(content)} {renderContent(content)}

View File

@@ -9,12 +9,14 @@ export interface UsingPopperProps {
content: string | ((props: any) => JSX.Element); content: string | ((props: any) => JSX.Element);
className?: string; className?: string;
refClassName?: string; refClassName?: string;
popperClassName?: string;
} }
interface Props { interface Props {
placement?: string; placement?: string;
className?: string; className?: string;
refClassName?: string; refClassName?: string;
popperClassName?: string;
content: string | ((props: any) => JSX.Element); content: string | ((props: any) => JSX.Element);
} }

View File

@@ -182,10 +182,8 @@
} }
.ack-tooltip { .ack-tooltip {
.drop-content { &.popper {
// Rewrite tooltip width max-width: 800px;
max-width: 70rem !important;
min-width: 30rem !important;
} }
.ack-comments { .ack-comments {
@@ -193,25 +191,13 @@
} }
.ack-add-button { .ack-add-button {
padding-top: 1rem; padding-top: 0.4rem;
text-align: left;
} }
table td, th { table td, th {
padding-right: 1rem; padding-right: 1rem;
} text-align: left;
.ack-input-group {
padding-top: 1rem;
input {
border: 1px solid;
border-radius: 2px;
width: 50%;
}
button {
margin-left: 1rem;
}
} }
} }