merge 2.0.0-m3

This commit is contained in:
Eduard Heimbuch
2019-08-15 10:51:36 +02:00
172 changed files with 3320 additions and 1792 deletions

View File

@@ -1,17 +1,10 @@
//@flow
import React from "react";
import {
Hunk,
Diff as DiffComponent,
getChangeKey,
Change,
DiffObjectProps,
File
} from "react-diff-view";
import {Change, Diff as DiffComponent, DiffObjectProps, File, getChangeKey, Hunk} from "react-diff-view";
import injectSheets from "react-jss";
import classNames from "classnames";
import { translate } from "react-i18next";
import { ButtonGroup, Button } from "../buttons";
import {translate} from "react-i18next";
import {Button, ButtonGroup} from "../buttons";
const styles = {
panel: {
@@ -178,12 +171,20 @@ class DiffFile extends React.Component<Props, State> {
if (key === value) {
value = file.type;
}
const color =
value === "added"
? "is-success"
: value === "deleted"
? "is-danger"
: "is-info";
return (
<span
className={classNames(
"tag",
"is-info",
"is-rounded",
"has-text-weight-normal",
color,
classes.changeType
)}
>