aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWouter Admiraal <wouter.admiraal@sonarsource.com>2019-04-15 09:25:13 +0200
committerSonarTech <sonartech@sonarsource.com>2019-04-25 20:21:05 +0200
commit159d8427bd256d7bcc27d8329bcb4baa15131e4b (patch)
tree40b1e344dea4bb3392e7f779dbc2cdd9206efd2b
parenta247dc044b37a7a26011020641aad5d8ec4ff4e9 (diff)
downloadsonarqube-159d8427bd256d7bcc27d8329bcb4baa15131e4b.tar.gz
sonarqube-159d8427bd256d7bcc27d8329bcb4baa15131e4b.zip
SONAR-11943 Text overlap on PRs with long branch names
-rw-r--r--server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMeta.tsx2
-rw-r--r--server/sonar-web/src/main/js/app/components/nav/component/ComponentNavWarnings.tsx2
-rw-r--r--server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavMeta-test.tsx.snap6
-rw-r--r--server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavWarnings-test.tsx.snap2
-rw-r--r--server/sonar-web/src/main/js/components/nav/ContextNavBar.css1
5 files changed, 6 insertions, 7 deletions
diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMeta.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMeta.tsx
index 9694df8232b..58497250583 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMeta.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMeta.tsx
@@ -50,7 +50,7 @@ export function ComponentNavMeta({ branchLike, component, currentUser, warnings
const displayVersion = component.version !== undefined && (mainBranch || longBranch);
return (
- <div className="navbar-context-meta">
+ <div className="navbar-context-meta flex-0">
{warnings.length > 0 && <ComponentNavWarnings warnings={warnings} />}
{component.analysisDate && (
<div className="spacer-left text-ellipsis">
diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavWarnings.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavWarnings.tsx
index 5a109838f16..18878b4fc81 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavWarnings.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavWarnings.tsx
@@ -51,7 +51,7 @@ export default class ComponentNavWarnings extends React.PureComponent<Props, Sta
render() {
return (
<>
- <div className="badge badge-focus badge-medium display-inline-flex-center js-component-analysis-warnings">
+ <div className="badge badge-focus badge-medium display-inline-flex-center js-component-analysis-warnings flex-1">
<WarningIcon className="spacer-right" />
<FormattedMessage
defaultMessage={translate('component_navigation.last_analsys_had_warnings')}
diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavMeta-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavMeta-test.tsx.snap
index dd33e351461..81301515cef 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavMeta-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavMeta-test.tsx.snap
@@ -2,7 +2,7 @@
exports[`#ComponentNavMeta renders meta for long-living branch 1`] = `
<div
- className="navbar-context-meta"
+ className="navbar-context-meta flex-0"
>
<div
className="spacer-left text-ellipsis"
@@ -42,7 +42,7 @@ exports[`#ComponentNavMeta renders meta for long-living branch 1`] = `
exports[`#ComponentNavMeta renders meta for pull request 1`] = `
<div
- className="navbar-context-meta"
+ className="navbar-context-meta flex-0"
>
<div
className="spacer-left text-ellipsis"
@@ -86,7 +86,7 @@ exports[`#ComponentNavMeta renders meta for pull request 1`] = `
exports[`#ComponentNavMeta renders status of short-living branch 1`] = `
<div
- className="navbar-context-meta"
+ className="navbar-context-meta flex-0"
>
<div
className="spacer-left text-ellipsis"
diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavWarnings-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavWarnings-test.tsx.snap
index 4e1414d8404..443b6505601 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavWarnings-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavWarnings-test.tsx.snap
@@ -3,7 +3,7 @@
exports[`should render 1`] = `
<Fragment>
<div
- className="badge badge-focus badge-medium display-inline-flex-center js-component-analysis-warnings"
+ className="badge badge-focus badge-medium display-inline-flex-center js-component-analysis-warnings flex-1"
>
<WarningIcon
className="spacer-right"
diff --git a/server/sonar-web/src/main/js/components/nav/ContextNavBar.css b/server/sonar-web/src/main/js/components/nav/ContextNavBar.css
index fa4a52d5b96..886eb85a313 100644
--- a/server/sonar-web/src/main/js/components/nav/ContextNavBar.css
+++ b/server/sonar-web/src/main/js/components/nav/ContextNavBar.css
@@ -74,7 +74,6 @@
.navbar-context-meta {
display: flex;
align-items: center;
- min-width: 0;
height: calc(4 * var(--gridSize));
padding-left: 20px;
color: var(--secondFontColor);