From 57721a8a447a8bd604c188f666459a47af87339a Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Tue, 16 Apr 2019 15:16:36 +0200 Subject: [PATCH 1/2] fixed borders, colours, styling in sources, users, groups and me detail view --- scm-ui/src/containers/ProfileInfo.js | 12 +- .../repos/components/RepositoryDetailTable.js | 110 +++++++++--------- scm-ui/src/users/components/table/Details.js | 14 +-- scm-ui/styles/scm.scss | 2 +- 4 files changed, 66 insertions(+), 72 deletions(-) diff --git a/scm-ui/src/containers/ProfileInfo.js b/scm-ui/src/containers/ProfileInfo.js index ab8eacae0e..a861524c80 100644 --- a/scm-ui/src/containers/ProfileInfo.js +++ b/scm-ui/src/containers/ProfileInfo.js @@ -40,21 +40,15 @@ class ProfileInfo extends React.Component { - + - + - + diff --git a/scm-ui/src/repos/components/RepositoryDetailTable.js b/scm-ui/src/repos/components/RepositoryDetailTable.js index ca63398670..a59ed254ef 100644 --- a/scm-ui/src/repos/components/RepositoryDetailTable.js +++ b/scm-ui/src/repos/components/RepositoryDetailTable.js @@ -1,55 +1,55 @@ -//@flow -import React from "react"; -import type { Repository } from "@scm-manager/ui-types"; -import { MailLink, DateFromNow } from "@scm-manager/ui-components"; -import { translate } from "react-i18next"; - -type Props = { - repository: Repository, - // context props - t: string => string -}; - -class RepositoryDetailTable extends React.Component { - render() { - const { repository, t } = this.props; - return ( -
- {t("profile.username")} - {t("profile.username")} {me.name}
- {t("profile.displayName")} - {t("profile.displayName")} {me.displayName}
- {t("profile.mail")} - {t("profile.mail")}
- - - - - - - - - - - - - - - - - - - - - - - - - - -
{t("repository.name")}{repository.name}
{t("repository.type")}{repository.type}
{t("repository.contact")} - -
{t("repository.description")}{repository.description}
{t("repository.creationDate")} - -
{t("repository.lastModified")} - -
- ); - } -} - -export default translate("repos")(RepositoryDetailTable); +//@flow +import React from "react"; +import type { Repository } from "@scm-manager/ui-types"; +import { MailLink, DateFromNow } from "@scm-manager/ui-components"; +import { translate } from "react-i18next"; + +type Props = { + repository: Repository, + // context props + t: string => string +}; + +class RepositoryDetailTable extends React.Component { + render() { + const { repository, t } = this.props; + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{t("repository.name")}{repository.name}
{t("repository.type")}{repository.type}
{t("repository.contact")} + +
{t("repository.description")}{repository.description}
{t("repository.creationDate")} + +
{t("repository.lastModified")} + +
+ ); + } +} + +export default translate("repos")(RepositoryDetailTable); diff --git a/scm-ui/src/users/components/table/Details.js b/scm-ui/src/users/components/table/Details.js index 83eebccc08..2195ec4665 100644 --- a/scm-ui/src/users/components/table/Details.js +++ b/scm-ui/src/users/components/table/Details.js @@ -16,37 +16,37 @@ class Details extends React.Component { - + - + - + - + - + - + - + diff --git a/scm-ui/styles/scm.scss b/scm-ui/styles/scm.scss index e02a4b28e0..c1b4fdb6de 100644 --- a/scm-ui/styles/scm.scss +++ b/scm-ui/styles/scm.scss @@ -165,7 +165,7 @@ $fa-font-path: "webfonts"; // tables .table { width: 100%; - td { + td, th { border-color: #eee; padding: 1rem; } From d11cb8ce37f383b181ac2416ce9e981b630b71e4 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 18 Apr 2019 06:08:41 +0000 Subject: [PATCH 2/2] Close branch feature/css_fix_table_styling
{t("user.name")}{t("user.name")} {user.name}
{t("user.displayName")}{t("user.displayName")} {user.displayName}
{t("user.mail")}{t("user.mail")}
{t("user.active")}{t("user.active")}
{t("user.type")}{t("user.type")} {user.type}
{t("user.creationDate")}{t("user.creationDate")}
{t("user.lastModified")}{t("user.lastModified")}