From 5774d8a1ee5abe0b3597f7fceafaaef95fbbfdc6 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 17 Jul 2019 17:35:29 +0200 Subject: [PATCH 1/3] added inherit styling and pass className --- .../packages/ui-components/src/Notification.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/scm-ui-components/packages/ui-components/src/Notification.js b/scm-ui-components/packages/ui-components/src/Notification.js index b48ae16851..46b6b8edcf 100644 --- a/scm-ui-components/packages/ui-components/src/Notification.js +++ b/scm-ui-components/packages/ui-components/src/Notification.js @@ -2,11 +2,18 @@ import * as React from "react"; import classNames from "classnames"; -type NotificationType = "primary" | "info" | "success" | "warning" | "danger"; +type NotificationType = + | "primary" + | "info" + | "success" + | "warning" + | "danger" + | "inherit"; type Props = { type: NotificationType, onClose?: () => void, + className?: string, children?: React.Node }; @@ -24,9 +31,12 @@ class Notification extends React.Component { } render() { - const { type, children } = this.props; + const { type, className, children } = this.props; + + const color = type !== "inherit" ? "is-" + type : ""; + return ( -
+
{this.renderCloseButton()} {children}
From 474b9a99a0534a7ecbc8914157e79dfc71cb4c2a Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Wed, 24 Jul 2019 08:56:12 +0200 Subject: [PATCH 2/3] add bulma popover / add Extensionpoint --- .../src/repos/changesets/ChangesetButtonGroup.js | 2 +- .../src/repos/changesets/ChangesetRow.js | 13 +++++++++++-- .../packages/ui-types/src/Changesets.js | 4 ++-- scm-ui/package.json | 1 + scm-ui/src/repos/containers/RepositoryRoot.js | 2 +- scm-ui/styles/scm.scss | 7 +++++++ scm-ui/yarn.lock | 5 +++++ 7 files changed, 28 insertions(+), 6 deletions(-) diff --git a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js index 72ce9a2b38..8d46a9f0b4 100644 --- a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js +++ b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js @@ -21,7 +21,7 @@ class ChangesetButtonGroup extends React.Component { const sourcesLink = createSourcesLink(repository, changeset); return ( - +
- +
+ +
+ +
+
diff --git a/scm-ui-components/packages/ui-types/src/Changesets.js b/scm-ui-components/packages/ui-types/src/Changesets.js index cab4233a7f..124fda3831 100644 --- a/scm-ui-components/packages/ui-types/src/Changesets.js +++ b/scm-ui-components/packages/ui-types/src/Changesets.js @@ -1,9 +1,9 @@ //@flow -import type {Links} from "./hal"; +import type {Collection, Links} from "./hal"; import type {Tag} from "./Tags"; import type {Branch} from "./Branches"; -export type Changeset = { +export type Changeset = Collection & { id: string, date: Date, author: { diff --git a/scm-ui/package.json b/scm-ui/package.json index dfb369e61e..a790935001 100644 --- a/scm-ui/package.json +++ b/scm-ui/package.json @@ -9,6 +9,7 @@ "@fortawesome/fontawesome-free": "^5.3.1", "@scm-manager/ui-extensions": "^0.1.2", "bulma": "^0.7.1", + "bulma-popover": "^1.0.0", "bulma-tooltip": "^2.0.2", "classnames": "^2.2.5", "font-awesome": "^4.7.0", diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js index 6630086964..5cb2078e5a 100644 --- a/scm-ui/src/repos/containers/RepositoryRoot.js +++ b/scm-ui/src/repos/containers/RepositoryRoot.js @@ -125,7 +125,7 @@ class RepositoryRoot extends React.Component { return (
-
+
Date: Wed, 24 Jul 2019 16:08:16 +0000 Subject: [PATCH 3/3] Close branch feature/ci_integration