From 59974b4aadafd1ebc2ffba3781b64c4923f1e6f5 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 11 Dec 2019 15:40:37 +0100 Subject: [PATCH 1/3] Move more buttons to the right --- .../src/main/js/RepositoryConfig.tsx | 14 +++++++++----- .../src/repos/branches/components/BranchForm.tsx | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/main/js/RepositoryConfig.tsx b/scm-plugins/scm-git-plugin/src/main/js/RepositoryConfig.tsx index 3ef02306fe..a23fc5040a 100644 --- a/scm-plugins/scm-git-plugin/src/main/js/RepositoryConfig.tsx +++ b/scm-plugins/scm-git-plugin/src/main/js/RepositoryConfig.tsx @@ -1,7 +1,7 @@ import React, { FormEvent } from "react"; import { WithTranslation, withTranslation } from "react-i18next"; import { Branch, Repository, Link } from "@scm-manager/ui-types"; -import { apiClient, BranchSelector, ErrorPage, Loading, Subtitle, SubmitButton } from "@scm-manager/ui-components"; +import { apiClient, BranchSelector, ErrorPage, Loading, Subtitle, Level, SubmitButton } from "@scm-manager/ui-components"; type Props = WithTranslation & { repository: Repository; @@ -143,10 +143,14 @@ class RepositoryConfig extends React.Component { } const submitButton = disabled ? null : ( - + } /> ); diff --git a/scm-ui/ui-webapp/src/repos/branches/components/BranchForm.tsx b/scm-ui/ui-webapp/src/repos/branches/components/BranchForm.tsx index eecb1942ee..0ccd39faec 100644 --- a/scm-ui/ui-webapp/src/repos/branches/components/BranchForm.tsx +++ b/scm-ui/ui-webapp/src/repos/branches/components/BranchForm.tsx @@ -1,7 +1,7 @@ import React from "react"; import { WithTranslation, withTranslation } from "react-i18next"; import { Repository, Branch, BranchRequest } from "@scm-manager/ui-types"; -import { Select, InputField, SubmitButton, validation as validator } from "@scm-manager/ui-components"; +import { Select, InputField, Level, SubmitButton, validation as validator } from "@scm-manager/ui-components"; import { orderBranches } from "../util/orderBranches"; type Props = WithTranslation & { @@ -83,10 +83,14 @@ class BranchForm extends React.Component {
- + } />
From 5ac88162ce857b3d667324c0eefc5289ac151242 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 11 Dec 2019 23:15:52 +0100 Subject: [PATCH 2/3] Hide file description also on tablet sizes, force file size to be one line --- .../ui-webapp/src/repos/sources/components/FileTree.tsx | 2 +- .../src/repos/sources/components/FileTreeLeaf.tsx | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scm-ui/ui-webapp/src/repos/sources/components/FileTree.tsx b/scm-ui/ui-webapp/src/repos/sources/components/FileTree.tsx index 150e4d1eb6..bfcb02e9bb 100644 --- a/scm-ui/ui-webapp/src/repos/sources/components/FileTree.tsx +++ b/scm-ui/ui-webapp/src/repos/sources/components/FileTree.tsx @@ -107,7 +107,7 @@ class FileTree extends React.Component { {t("sources.file-tree.name")} {t("sources.file-tree.length")} {t("sources.file-tree.lastModified")} - {t("sources.file-tree.description")} + {t("sources.file-tree.description")} {binder.hasExtension("repos.sources.tree.row.right") && } diff --git a/scm-ui/ui-webapp/src/repos/sources/components/FileTreeLeaf.tsx b/scm-ui/ui-webapp/src/repos/sources/components/FileTreeLeaf.tsx index 961d65c043..ae92b150ba 100644 --- a/scm-ui/ui-webapp/src/repos/sources/components/FileTreeLeaf.tsx +++ b/scm-ui/ui-webapp/src/repos/sources/components/FileTreeLeaf.tsx @@ -16,6 +16,10 @@ const MinWidthTd = styled.td` min-width: 10em; `; +const NoWrapTd = styled.td` + white-space: nowrap; +`; + export function createLink(base: string, file: File) { let link = base; if (file.path) { @@ -67,11 +71,11 @@ export default class FileTreeLeaf extends React.Component { {this.createFileIcon(file)} {this.createFileName(file)} - {fileSize} + {fileSize} - {file.description} + {file.description} {binder.hasExtension("repos.sources.tree.row.right") && ( {!file.directory && ( From bc6097a922e2789d52eceb10a213f1bd0e78ad37 Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Thu, 12 Dec 2019 10:01:27 +0000 Subject: [PATCH 3/3] Close branch feature/ui_adjustments