Skip to content
Snippets Groups Projects
Commit 9dcab5cd authored by Tom Robinson's avatar Tom Robinson
Browse files

Move FieldSet to metabase/components

parent cf624f0f
No related branches found
No related tags found
No related merge requests found
......@@ -4,7 +4,7 @@ import { Link } from "react-router";
import FormLabel from "../components/FormLabel.jsx";
import FormInput from "../components/FormInput.jsx";
import FormTextArea from "../components/FormTextArea.jsx";
import FieldSet from "../components/FieldSet.jsx";
import FieldSet from "metabase/components/FieldSet.jsx";
import PartialQueryBuilder from "../components/PartialQueryBuilder.jsx";
import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper.jsx";
......
......@@ -4,7 +4,7 @@ import { Link } from "react-router";
import FormLabel from "../components/FormLabel.jsx";
import FormInput from "../components/FormInput.jsx";
import FormTextArea from "../components/FormTextArea.jsx";
import FieldSet from "../components/FieldSet.jsx";
import FieldSet from "metabase/components/FieldSet.jsx";
import PartialQueryBuilder from "../components/PartialQueryBuilder.jsx";
import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper.jsx";
......
import React, { Component, PropTypes } from "react";
import cx from "classnames";
export default class FieldSet extends Component {
static propTypes = {};
static defaultProps = {
border: "border-brand"
className: "border-brand"
};
render() {
const { children, legend, border } = this.props;
const { className, children, legend } = this.props;
return (
<fieldset className={"px2 pb2 bordered rounded " + border}>
<fieldset className={cx(className, "px2 pb2 bordered rounded")}>
{legend && <legend className="h5 text-bold text-uppercase px1" style={{ marginLeft: "-0.5rem" }}>{legend}</legend>}
{children}
</fieldset>
......
......@@ -2,7 +2,7 @@ import React, { Component, PropTypes } from "react";
import FilterList from "./filters/FilterList.jsx";
import AggregationWidget from "./AggregationWidget.jsx";
import FieldSet from "metabase/admin/datamodel/components/FieldSet.jsx";
import FieldSet from "metabase/components/FieldSet.jsx";
import Query from "metabase/lib/query";
......@@ -29,7 +29,7 @@ export default class QueryDefinitionTooltip extends Component {
</div>
{ object.definition &&
<div className="mt2">
<FieldSet legend="Definition" border="border-light">
<FieldSet legend="Definition" className="border-light">
<div className="TooltipFilterList">
{ object.definition.aggregation &&
<AggregationWidget
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment