mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-06 21:45:43 +01:00
replaced self-hacked™ solution with bulma panels for changesets
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
// @flow
|
||||
|
||||
import React from "react";
|
||||
import type {Branch} from "@scm-manager/ui-types";
|
||||
import TableHeader from "./TableHeader";
|
||||
import type { Branch } from "@scm-manager/ui-types";
|
||||
import injectSheet from "react-jss";
|
||||
import classNames from "classnames";
|
||||
import DropDown from "./forms/DropDown";
|
||||
@@ -13,6 +12,12 @@ const styles = {
|
||||
},
|
||||
minWidthOfLabel: {
|
||||
minWidth: "4.5rem"
|
||||
},
|
||||
labelSizing: {
|
||||
fontSize: "1rem !important"
|
||||
},
|
||||
noBottomMargin: {
|
||||
marginBottom: "0 !important"
|
||||
}
|
||||
};
|
||||
|
||||
@@ -35,7 +40,9 @@ class BranchSelector extends React.Component<Props, State> {
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
const selectedBranch = this.props.branches.find(branch => branch.name === this.props.selectedBranch);
|
||||
const selectedBranch = this.props.branches.find(
|
||||
branch => branch.name === this.props.selectedBranch
|
||||
);
|
||||
this.setState({ selectedBranch });
|
||||
}
|
||||
|
||||
@@ -44,7 +51,13 @@ class BranchSelector extends React.Component<Props, State> {
|
||||
|
||||
if (branches) {
|
||||
return (
|
||||
<TableHeader>
|
||||
<div
|
||||
className={classNames(
|
||||
"field",
|
||||
"is-horizontal",
|
||||
classes.noBottomMargin
|
||||
)}
|
||||
>
|
||||
<div
|
||||
className={classNames(
|
||||
"field-label",
|
||||
@@ -53,10 +66,14 @@ class BranchSelector extends React.Component<Props, State> {
|
||||
classes.minWidthOfLabel
|
||||
)}
|
||||
>
|
||||
<label className="label">{label}</label>
|
||||
<label className={classNames("label", classes.labelSizing)}>
|
||||
{label}
|
||||
</label>
|
||||
</div>
|
||||
<div className="field-body">
|
||||
<div className="field is-narrow">
|
||||
<div
|
||||
className={classNames("field is-narrow", classes.noBottomMargin)}
|
||||
>
|
||||
<div className="control">
|
||||
<DropDown
|
||||
className="is-fullwidth"
|
||||
@@ -71,7 +88,7 @@ class BranchSelector extends React.Component<Props, State> {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</TableHeader>
|
||||
</div>
|
||||
);
|
||||
} else {
|
||||
return null;
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
//@flow
|
||||
import * as React from "react";
|
||||
import classNames from "classnames";
|
||||
import injectSheet from "react-jss";
|
||||
|
||||
type Props = {
|
||||
children?: React.Node,
|
||||
classes: Object
|
||||
};
|
||||
|
||||
const styles = {
|
||||
wrapper: {
|
||||
padding: "1rem 1.5rem 0.25rem 1.5rem",
|
||||
borderBottom: "1px solid #dbdbdb"
|
||||
}
|
||||
};
|
||||
|
||||
class TableHeader extends React.Component<Props> {
|
||||
render() {
|
||||
const { classes, children } = this.props;
|
||||
return (
|
||||
<div
|
||||
className={classNames(
|
||||
"has-background-light field",
|
||||
"is-horizontal",
|
||||
classes.wrapper
|
||||
)}
|
||||
>
|
||||
{children}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default injectSheet(styles)(TableHeader);
|
||||
@@ -25,7 +25,6 @@ export { default as Tooltip } from "./Tooltip";
|
||||
export { getPageFromMatch } from "./urls";
|
||||
export { default as Autocomplete} from "./Autocomplete";
|
||||
export { default as BranchSelector } from "./BranchSelector";
|
||||
export { default as TableHeader } from "./TableHeader";
|
||||
|
||||
export { apiClient, NOT_FOUND_ERROR, UNAUTHORIZED_ERROR, CONFLICT_ERROR } from "./apiclient.js";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user