Use "tablist" nav styles from theme, remove excess styles

pull/10616/head
Alex P 2017-05-22 19:17:28 -07:00
parent 8156f66ac7
commit 566c9974d2
5 changed files with 25 additions and 36 deletions

View File

@ -4,14 +4,14 @@ import classnames from 'classnames'
const VisHeader = ({views, view, onToggleView, name}) => ( const VisHeader = ({views, view, onToggleView, name}) => (
<div className="graph-heading"> <div className="graph-heading">
{views.length {views.length
? <ul className="toggle toggle-sm"> ? <ul className="nav nav-tablist nav-tablist-sm">
{views.map(v => ( {views.map(v => (
<li <li
key={v} key={v}
onClick={() => onToggleView(v)} onClick={() => onToggleView(v)}
className={classnames('toggle-btn ', {active: view === v})} className={classnames({active: view === v})}
> >
{v} {v.charAt(0).toUpperCase() + v.slice(1)}
</li> </li>
))} ))}
</ul> </ul>

View File

@ -58,12 +58,13 @@ export const RuleMessage = React.createClass({
<div className="rule-section-body"> <div className="rule-section-body">
<div className="kapacitor-values-tabs"> <div className="kapacitor-values-tabs">
<p>Send this Alert to:</p> <p>Send this Alert to:</p>
<ul className="btn-group btn-group-lg tab-group"> <ul className="nav nav-tablist nav-tablist-sm nav-tablist-malachite">
{alerts.map(alert => ( {alerts.map(alert => (
<li <li
key={alert.text} key={alert.text.toLowerCase()}
className={classnames('btn tab', { className={classnames({
active: alert.text === selectedAlert, active: alert.text.toLowerCase() ===
selectedAlert.toLowerCase(),
})} })}
onClick={() => this.handleChooseAlert(alert)} onClick={() => this.handleChooseAlert(alert)}
> >

View File

@ -27,7 +27,9 @@ export const ValuesSection = React.createClass({
<div className="rule-section-body"> <div className="rule-section-body">
<Tabs initialIndex={initialIndex} onSelect={this.handleChooseTrigger}> <Tabs initialIndex={initialIndex} onSelect={this.handleChooseTrigger}>
<TabList isKapacitorTabs="true"> <TabList isKapacitorTabs="true">
{TABS.map(tab => <Tab key={tab}>{tab}</Tab>)} {TABS.map(tab => (
<Tab key={tab} isKapacitorTab={true}>{tab}</Tab>
))}
</TabList> </TabList>
<TabPanels> <TabPanels>

View File

@ -8,9 +8,20 @@ export const Tab = React.createClass({
onClick: func, onClick: func,
isDisabled: bool, isDisabled: bool,
isActive: bool, isActive: bool,
isKapacitorTab: bool,
}, },
render() { render() {
if (this.props.isKapacitorTab) {
return (
<li
className={classnames({active: this.props.isActive})}
onClick={this.props.isDisabled ? null : this.props.onClick}
>
{this.props.children}
</li>
)
}
return ( return (
<div <div
className={classnames('btn tab', {active: this.props.isActive})} className={classnames('btn tab', {active: this.props.isActive})}
@ -49,7 +60,9 @@ export const TabList = React.createClass({
return ( return (
<div className="kapacitor-values-tabs"> <div className="kapacitor-values-tabs">
<p>Alert Type</p> <p>Alert Type</p>
<div className="btn-group btn-group-lg tab-group">{children}</div> <div className="nav nav-tablist nav-tablist-sm nav-tablist-malachite">
{children}
</div>
</div> </div>
) )
} }

View File

@ -419,33 +419,6 @@ $kapacitor-font-sm: 13px;
.kapacitor-alert-message, { .kapacitor-alert-message, {
border-radius: $kap-radius-lg $kap-radius-lg 0 0; border-radius: $kap-radius-lg $kap-radius-lg 0 0;
border-bottom: 2px solid $kapacitor-divider-color; border-bottom: 2px solid $kapacitor-divider-color;
.tab-group {
padding: 0;
> .btn.tab {
padding: 0 $kap-padding-md;
height: $kap-input-height;
line-height: ($kap-input-height - 4px);
font-size: $kapacitor-font-sm;
font-weight: 700;
background-color: $kapacitor-graphic-color;
border-color: $g5-pepper;
color: $g11-sidewalk;
&:hover {
background-color: $g4-onyx;
color: $g20-white;
}
&.active {
background-color: $g5-pepper;
color: $kapacitor-accent;
}
}
}
}
.rule-builder .form-control--green {
font-weight: 600 !important;
} }
input.size-486 {width: 486px;} input.size-486 {width: 486px;}