From 016eea56e88b58ec8f63cac9b16b5842a10619f2 Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Wed, 16 Oct 2019 17:28:06 +0200 Subject: [PATCH] fix ui bug --- .../ui-components/src/buttons/ButtonAddons.js | 17 ++++++++++++++--- .../src/repos/sources/containers/Content.js | 19 +++++++------------ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/scm-ui/ui-components/src/buttons/ButtonAddons.js b/scm-ui/ui-components/src/buttons/ButtonAddons.js index 4208b34294..6e443bb356 100644 --- a/scm-ui/ui-components/src/buttons/ButtonAddons.js +++ b/scm-ui/ui-components/src/buttons/ButtonAddons.js @@ -1,6 +1,13 @@ // @flow import * as React from "react"; import classNames from "classnames"; +import styled from "styled-components"; + +const Flex = styled.div` + &.field:not(:last-child) { + margin-bottom: 0; + } +`; type Props = { className?: string, @@ -14,14 +21,18 @@ class ButtonAddons extends React.Component { const childWrapper = []; React.Children.forEach(children, child => { if (child) { - childWrapper.push(

{child}

); + childWrapper.push( +

+ {child} +

+ ); } }); return ( -
+ {childWrapper} -
+ ); } } diff --git a/scm-ui/ui-webapp/src/repos/sources/containers/Content.js b/scm-ui/ui-webapp/src/repos/sources/containers/Content.js index fea3abaee0..d6e3b6b8fd 100644 --- a/scm-ui/ui-webapp/src/repos/sources/containers/Content.js +++ b/scm-ui/ui-webapp/src/repos/sources/containers/Content.js @@ -1,18 +1,13 @@ // @flow import React from "react"; -import { connect } from "react-redux"; -import { translate } from "react-i18next"; +import {connect} from "react-redux"; +import {translate} from "react-i18next"; import classNames from "classnames"; import styled from "styled-components"; -import { ExtensionPoint } from "@scm-manager/ui-extensions"; -import type { File, Repository } from "@scm-manager/ui-types"; -import { - DateFromNow, - FileSize, - ErrorNotification, - Icon -} from "@scm-manager/ui-components"; -import { getSources } from "../modules/sources"; +import {ExtensionPoint} from "@scm-manager/ui-extensions"; +import type {File, Repository} from "@scm-manager/ui-types"; +import {DateFromNow, ErrorNotification, FileSize, Icon} from "@scm-manager/ui-components"; +import {getSources} from "../modules/sources"; import FileButtonAddons from "../components/content/FileButtonAddons"; import SourcesView from "./SourcesView"; import HistoryView from "./HistoryView"; @@ -34,7 +29,7 @@ type State = { errorFromExtension?: Error }; -const VCenteredChild = styled.article` +const VCenteredChild = styled.div` align-items: center; `;