aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web
diff options
context:
space:
mode:
Diffstat (limited to 'server/sonar-web')
-rw-r--r--server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js20
-rw-r--r--server/sonar-web/src/main/js/components/issue/popups/__tests__/__snapshots__/ChangelogPopup-test.js.snap23
-rw-r--r--server/sonar-web/src/main/less/components/bubble-popup.less1
-rw-r--r--server/sonar-web/src/main/less/components/issues.less3
4 files changed, 22 insertions, 25 deletions
diff --git a/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js b/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js
index c856a2c94c7..7551e9869db 100644
--- a/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js
+++ b/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js
@@ -82,7 +82,6 @@ export default class ChangelogPopup extends React.PureComponent {
<td className="thin text-left text-top nowrap">
{moment(issue.creationDate).format('LLL')}
</td>
- <td className="thin text-left text-top nowrap" />
<td className="text-left text-top">
{author ? `${translate('created_by')} ${author}` : translate('created')}
</td>
@@ -93,16 +92,17 @@ export default class ChangelogPopup extends React.PureComponent {
<td className="thin text-left text-top nowrap">
{moment(item.creationDate).format('LLL')}
</td>
- <td className="thin text-left text-top nowrap">
- <Avatar
- className="little-spacer-right"
- hash={item.avatar}
- name={item.userName}
- size={16}
- />
- {item.userName}
- </td>
<td className="text-left text-top">
+ {item.userName &&
+ <p>
+ <Avatar
+ className="little-spacer-right"
+ hash={item.avatar}
+ name={item.userName}
+ size={16}
+ />
+ {item.userName}
+ </p>}
{item.diffs.map(diff => <IssueChangelogDiff key={diff.key} diff={diff} />)}
</td>
</tr>
diff --git a/server/sonar-web/src/main/js/components/issue/popups/__tests__/__snapshots__/ChangelogPopup-test.js.snap b/server/sonar-web/src/main/js/components/issue/popups/__tests__/__snapshots__/ChangelogPopup-test.js.snap
index 8934f554418..078a01fc7bf 100644
--- a/server/sonar-web/src/main/js/components/issue/popups/__tests__/__snapshots__/ChangelogPopup-test.js.snap
+++ b/server/sonar-web/src/main/js/components/issue/popups/__tests__/__snapshots__/ChangelogPopup-test.js.snap
@@ -18,9 +18,6 @@ exports[`should render the changelog popup correctly 1`] = `
March 1, 2017 9:36 AM
</td>
<td
- className="thin text-left text-top nowrap"
- />
- <td
className="text-left text-top"
>
created_by john.david.dalton@gmail.com
@@ -33,19 +30,17 @@ exports[`should render the changelog popup correctly 1`] = `
March 1, 2017 9:36 AM
</td>
<td
- className="thin text-left text-top nowrap"
- >
- <Connect(Avatar)
- className="little-spacer-right"
- hash="gravatarhash"
- name="john.doe"
- size={16}
- />
- john.doe
- </td>
- <td
className="text-left text-top"
>
+ <p>
+ <Connect(Avatar)
+ className="little-spacer-right"
+ hash="gravatarhash"
+ name="john.doe"
+ size={16}
+ />
+ john.doe
+ </p>
<IssueChangelogDiff
diff={
Object {
diff --git a/server/sonar-web/src/main/less/components/bubble-popup.less b/server/sonar-web/src/main/less/components/bubble-popup.less
index 1986221db05..ee39d02449c 100644
--- a/server/sonar-web/src/main/less/components/bubble-popup.less
+++ b/server/sonar-web/src/main/less/components/bubble-popup.less
@@ -33,6 +33,7 @@
box-sizing: border-box;
background-color: @white;
box-shadow: @defaultShadow;
+ cursor: default;
}
.bubble-popup-menu {
diff --git a/server/sonar-web/src/main/less/components/issues.less b/server/sonar-web/src/main/less/components/issues.less
index 18ef383c2b7..6a861ec641f 100644
--- a/server/sonar-web/src/main/less/components/issues.less
+++ b/server/sonar-web/src/main/less/components/issues.less
@@ -162,6 +162,7 @@
}
.issue-changelog {
+ min-width: 450px;
max-width: 540px;
max-height: 320px;
overflow: auto;
@@ -371,4 +372,4 @@ input.issue-action-options-search {
.issue .menu {
max-height: 120px;
overflow: auto;
-} \ No newline at end of file
+}