From 8123fbb1648573d37ef1f7c630a20b9c781fa566 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Mon, 21 Sep 2020 10:37:03 +0200 Subject: [PATCH 1/2] Correct overflow for too long branch names --- .../src/repos/codeSection/components/CodeActionBar.tsx | 9 ++++++++- yarn.lock | 8 ++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/scm-ui/ui-webapp/src/repos/codeSection/components/CodeActionBar.tsx b/scm-ui/ui-webapp/src/repos/codeSection/components/CodeActionBar.tsx index f20ef26d3f..fbe3216d44 100644 --- a/scm-ui/ui-webapp/src/repos/codeSection/components/CodeActionBar.tsx +++ b/scm-ui/ui-webapp/src/repos/codeSection/components/CodeActionBar.tsx @@ -41,6 +41,13 @@ const ActionBar = styled.div` margin-bottom: 1em; `; +const FlexShrinkLevel = styled(Level)` + .level-left { + flex-shrink: 1; + margin-right: 0.75rem; + } +`; + type Props = { selectedBranch?: string; branches: Branch[]; @@ -54,7 +61,7 @@ const CodeActionBar: FC = ({ selectedBranch, branches, onSelectBranch, sw return ( - 0 && ( Date: Mon, 21 Sep 2020 11:14:36 +0200 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 208e2f7d4a..6ce495cb63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Missing synchronization during repository creation ([#1328](https://github.com/scm-manager/scm-manager/pull/1328)) - Missing BranchCreatedEvent for mercurial ([#1334](https://github.com/scm-manager/scm-manager/pull/1334)) - Branch not found right after creation ([#1334](https://github.com/scm-manager/scm-manager/pull/1334)) +- Overflow for too long branch names ([#1339](https://github.com/scm-manager/scm-manager/pull/1339)) ## [2.5.0] - 2020-09-10 ### Added