diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 3145b6a338..1805f0665b 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -9,7 +9,7 @@ "flow": "flow check" }, "dependencies": { - "@scm-manager/ui-extensions": "^0.1.1" + "@scm-manager/ui-extensions": "^0.1.2" }, "devDependencies": { "@scm-manager/ui-bundler": "^0.0.24" diff --git a/scm-plugins/scm-git-plugin/yarn.lock b/scm-plugins/scm-git-plugin/yarn.lock index 234ed65102..64c47a247d 100644 --- a/scm-plugins/scm-git-plugin/yarn.lock +++ b/scm-plugins/scm-git-plugin/yarn.lock @@ -747,9 +747,10 @@ vinyl-source-stream "^2.0.0" watchify "^3.11.0" -"@scm-manager/ui-extensions@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" +"@scm-manager/ui-extensions@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc" + integrity sha512-oIkXcc/VWssnK/yjWKC/Wnq5DZ01rArsz76n4X/0DT0hkGNIKmwk/Fdp7OoXiUEb7+aaPjUX1VvDqlTwCNKPmA== dependencies: react "^16.4.2" react-dom "^16.4.2" diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index 0638a464de..849d8a92cb 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -6,7 +6,7 @@ "build": "ui-bundler plugin" }, "dependencies": { - "@scm-manager/ui-extensions": "^0.1.1" + "@scm-manager/ui-extensions": "^0.1.2" }, "devDependencies": { "@scm-manager/ui-bundler": "^0.0.24" diff --git a/scm-plugins/scm-hg-plugin/yarn.lock b/scm-plugins/scm-hg-plugin/yarn.lock index 0666ef408d..b47e6e6e32 100644 --- a/scm-plugins/scm-hg-plugin/yarn.lock +++ b/scm-plugins/scm-hg-plugin/yarn.lock @@ -681,9 +681,10 @@ vinyl-source-stream "^2.0.0" watchify "^3.11.0" -"@scm-manager/ui-extensions@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" +"@scm-manager/ui-extensions@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc" + integrity sha512-oIkXcc/VWssnK/yjWKC/Wnq5DZ01rArsz76n4X/0DT0hkGNIKmwk/Fdp7OoXiUEb7+aaPjUX1VvDqlTwCNKPmA== dependencies: react "^16.4.2" react-dom "^16.4.2" diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index e51f3b9bfd..e5cddc0bba 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -6,7 +6,7 @@ "build": "ui-bundler plugin" }, "dependencies": { - "@scm-manager/ui-extensions": "^0.1.1" + "@scm-manager/ui-extensions": "^0.1.2" }, "devDependencies": { "@scm-manager/ui-bundler": "^0.0.24" diff --git a/scm-plugins/scm-svn-plugin/yarn.lock b/scm-plugins/scm-svn-plugin/yarn.lock index 0666ef408d..b47e6e6e32 100644 --- a/scm-plugins/scm-svn-plugin/yarn.lock +++ b/scm-plugins/scm-svn-plugin/yarn.lock @@ -681,9 +681,10 @@ vinyl-source-stream "^2.0.0" watchify "^3.11.0" -"@scm-manager/ui-extensions@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.1.tgz#966e62d89981e92a14adf7e674e646e76de96d45" +"@scm-manager/ui-extensions@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@scm-manager/ui-extensions/-/ui-extensions-0.1.2.tgz#0689427ca45c8e4e045b5b9dbc89036f1d2c45fc" + integrity sha512-oIkXcc/VWssnK/yjWKC/Wnq5DZ01rArsz76n4X/0DT0hkGNIKmwk/Fdp7OoXiUEb7+aaPjUX1VvDqlTwCNKPmA== dependencies: react "^16.4.2" react-dom "^16.4.2" diff --git a/scm-ui-components/packages/ui-components/package.json b/scm-ui-components/packages/ui-components/package.json index 06e007e871..bb8e5c738e 100644 --- a/scm-ui-components/packages/ui-components/package.json +++ b/scm-ui-components/packages/ui-components/package.json @@ -26,7 +26,7 @@ "react-router-enzyme-context": "^1.2.0" }, "dependencies": { - "@scm-manager/ui-extensions": "^0.1.1", + "@scm-manager/ui-extensions": "^0.1.2", "@scm-manager/ui-types": "2.0.0-SNAPSHOT", "classnames": "^2.2.6", "moment": "^2.22.2", diff --git a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js index ef9de9bfe5..7609bc2171 100644 --- a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js +++ b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js @@ -3,15 +3,16 @@ import React from "react"; import type { Changeset, Repository, Tag } from "@scm-manager/ui-types"; import classNames from "classnames"; -import {Interpolate, translate} from "react-i18next"; +import { Interpolate, translate } from "react-i18next"; import ChangesetId from "./ChangesetId"; import injectSheet from "react-jss"; -import {DateFromNow} from "../.."; +import { DateFromNow } from "../.."; import ChangesetAuthor from "./ChangesetAuthor"; import ChangesetTag from "./ChangesetTag"; -import {parseDescription} from "./changesets"; -import {AvatarWrapper, AvatarImage} from "../../avatar"; +import { parseDescription } from "./changesets"; +import { AvatarWrapper, AvatarImage } from "../../avatar"; +import { ExtensionPoint } from "@scm-manager/ui-extensions"; const styles = { pointer: { @@ -64,7 +65,15 @@ class ChangesetRow extends React.Component {

- {description.title} + + + {description.title} + +
{ return (

-

{description.title}

+

+ + {description.title} + +

@@ -67,22 +75,23 @@ class ChangesetDetails extends React.Component {

{this.renderTags()}
- -

- {description.message.split("\n").map((item, key) => { - return ( - + +

+ {description.message.split("\n").map((item, key) => { + return ( + + {item} -
-
- ); - })} -

-
+ +
+ + ); + })} +

diff --git a/scm-ui/src/repos/components/list/RepositoryEntry.js b/scm-ui/src/repos/components/list/RepositoryEntry.js index 122128db3a..28a6fe1ad3 100644 --- a/scm-ui/src/repos/components/list/RepositoryEntry.js +++ b/scm-ui/src/repos/components/list/RepositoryEntry.js @@ -9,16 +9,6 @@ import classNames from "classnames"; import RepositoryAvatar from "./RepositoryAvatar"; const styles = { - overlayFullColumn: { - position: "absolute", - height: "calc(120px - 0.5rem)", - width: "calc(100% - 1.5rem)" - }, - overlayHalfColumn: { - position: "absolute", - height: "calc(120px - 1.5rem)", - width: "calc(50% - 3rem)" - }, inner: { position: "relative", pointerEvents: "none", @@ -86,8 +76,8 @@ class RepositoryEntry extends React.Component { const repositoryLink = this.createLink(repository); const halfColumn = fullColumnWidth ? "is-full" : "is-half"; const overlayLinkClass = fullColumnWidth - ? classes.overlayFullColumn - : classes.overlayHalfColumn; + ? "overlay-full-column" + : "overlay-half-column"; return (