diff options
author | Stas Vilchik <stas.vilchik@sonarsource.com> | 2017-10-31 16:26:09 +0100 |
---|---|---|
committer | Stas Vilchik <stas.vilchik@sonarsource.com> | 2017-11-03 14:28:18 +0100 |
commit | 20a70acea9fad007677c6e5ba28b99a6a7b532cc (patch) | |
tree | 5748fbe5568d81c5f8f0ac72ccbd6cea75d3093e /server/sonar-web/src/main/js/components/issue | |
parent | ee2fab297a68aaebcdcb3b71b1fc49f2f89a5d46 (diff) | |
download | sonarqube-20a70acea9fad007677c6e5ba28b99a6a7b532cc.tar.gz sonarqube-20a70acea9fad007677c6e5ba28b99a6a7b532cc.zip |
SONAR-10022 Grouping actions must be consistent
Diffstat (limited to 'server/sonar-web/src/main/js/components/issue')
2 files changed, 26 insertions, 14 deletions
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js b/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js index f6c73044282..79c2f1c7b18 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js +++ b/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js @@ -21,6 +21,8 @@ import React from 'react'; import Avatar from '../../../components/ui/Avatar'; import BubblePopupHelper from '../../../components/common/BubblePopupHelper'; +import EditIcon from '../../../components/icons-components/EditIcon'; +import DeleteIcon from '../../../components/icons-components/DeleteIcon'; import CommentDeletePopup from '../popups/CommentDeletePopup'; import CommentPopup from '../popups/CommentPopup'; import DateFromNow from '../../../components/intl/DateFromNow'; @@ -118,9 +120,10 @@ export default class IssueCommentLine extends React.PureComponent { /> }> <button - className="js-issue-comment-edit button-link icon-edit icon-half-transparent" - onClick={this.toggleEditPopup} - /> + className="js-issue-comment-edit button-link icon-half-transparent" + onClick={this.toggleEditPopup}> + <EditIcon /> + </button> </BubblePopupHelper> )} {comment.updatable && ( @@ -132,9 +135,10 @@ export default class IssueCommentLine extends React.PureComponent { togglePopup={this.toggleDeletePopup} popup={<CommentDeletePopup onDelete={this.handleDelete} />}> <button - className="js-issue-comment-delete button-link icon-delete icon-half-transparent" - onClick={this.toggleDeletePopup} - /> + className="js-issue-comment-delete button-link icon-half-transparent little-spacer-left" + onClick={this.toggleDeletePopup}> + <DeleteIcon /> + </button> </BubblePopupHelper> )} </div> diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/__snapshots__/IssueCommentLine-test.js.snap b/server/sonar-web/src/main/js/components/issue/components/__tests__/__snapshots__/IssueCommentLine-test.js.snap index d31a9e8eba2..2ffdaa63fd4 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/__snapshots__/IssueCommentLine-test.js.snap +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/__snapshots__/IssueCommentLine-test.js.snap @@ -80,9 +80,11 @@ exports[`should open the right popups when the buttons are clicked 3`] = ` togglePopup={[Function]} > <button - className="js-issue-comment-edit button-link icon-edit icon-half-transparent" + className="js-issue-comment-edit button-link icon-half-transparent" onClick={[Function]} - /> + > + <EditIcon /> + </button> </BubblePopupHelper> <BubblePopupHelper className="bubble-popup-helper-inline" @@ -102,9 +104,11 @@ exports[`should open the right popups when the buttons are clicked 3`] = ` togglePopup={[Function]} > <button - className="js-issue-comment-delete button-link icon-delete icon-half-transparent" + className="js-issue-comment-delete button-link icon-half-transparent little-spacer-left" onClick={[Function]} - /> + > + <DeleteIcon /> + </button> </BubblePopupHelper> </div> </div> @@ -218,9 +222,11 @@ exports[`should render correctly a comment that is updatable 1`] = ` togglePopup={[Function]} > <button - className="js-issue-comment-edit button-link icon-edit icon-half-transparent" + className="js-issue-comment-edit button-link icon-half-transparent" onClick={[Function]} - /> + > + <EditIcon /> + </button> </BubblePopupHelper> <BubblePopupHelper className="bubble-popup-helper-inline" @@ -240,9 +246,11 @@ exports[`should render correctly a comment that is updatable 1`] = ` togglePopup={[Function]} > <button - className="js-issue-comment-delete button-link icon-delete icon-half-transparent" + className="js-issue-comment-delete button-link icon-half-transparent little-spacer-left" onClick={[Function]} - /> + > + <DeleteIcon /> + </button> </BubblePopupHelper> </div> </div> |