diff options
| author | ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com> | 2017-05-26 23:32:13 +0200 |
|---|---|---|
| committer | ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com> | 2017-05-26 23:32:13 +0200 |
| commit | e7f0cea1028718b89ec722202e464a71e694a177 (patch) | |
| tree | 7a05667fddf9b5319e6d04cb0dd5d20af932f0df /server/sonar-web | |
| parent | 2bbb7bb6b9c1937a459adfe22f84d835a687fec7 (diff) | |
| parent | 981424daf18ee985438af28344b562d2471f3a50 (diff) | |
| download | sonarqube-e7f0cea1028718b89ec722202e464a71e694a177.tar.gz sonarqube-e7f0cea1028718b89ec722202e464a71e694a177.zip | |
Automatic merge from branch-6.4
* origin/branch-6.4:
SONAR-8888 index active rules when creating organization
remove avatar for system events on issues changelog popup (#2109)
Use Trusty image on TravisCI
Diffstat (limited to 'server/sonar-web')
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 +} |