feat(threaded-replies): fix styling for resolve (#3129)

* feat(threaded-replies): fix styling for resolve

* feat(threaded-replies): Change trash icon in menu

Author: MateuszMamczarz

src/elements/content-sidebar/activity-feed/annotations/AnnotationActivityMenu.js

@@ -7,14 +7,15 @@ import Checkmark16 from '../../../../icon/fill/Checkmark16';
 import IconEllipsis from '../../../../icons/general/IconEllipsis';
 import Pencil16 from '../../../../icon/line/Pencil16';
 import PlainButton from '../../../../components/plain-button';
-import Trash16 from '../../../../icon/fill/Trash16';
+import Trash16 from '../../../../icon/line/Trash16';
 import X16 from '../../../../icon/fill/X16';
 import { Menu, MenuItem } from '../../../../components/menu';
 import { ACTIVITY_TARGETS } from '../../../common/interactionTargets';
 import { COMMENT_STATUS_OPEN, COMMENT_STATUS_RESOLVED } from '../../../../constants';
 import { bdlGray50 } from '../../../../styles/variables';
 import type { FeedItemStatus } from '../../../../common/types/feed';
 import messages from './messages';
+import './AnnotationActivityMenu.scss';
 
 type AnnotationActivityMenuProps = {
     canDelete?: boolean,
@@ -64,6 +65,7 @@ const AnnotationActivityMenu = ({
             <Menu {...menuProps}>
                 {canResolve && isResolved && (
                     <MenuItem
+                        className="bcs-AnnotationActivityMenu-unresolveAnnotation"
                         data-resin-itemid={id}
                         data-resin-target={ACTIVITY_TARGETS.ANNOTATION_OPTIONS_UNRESOLVE}
                         data-testid="unresolve-annotation-activity"

src/elements/content-sidebar/activity-feed/annotations/AnnotationActivityMenu.scss

@@ -0,0 +1,5 @@
+@import '../../../common/variables';
+
+.bcs-AnnotationActivityMenu-unresolveAnnotation path {
+    fill: $bdl-gray;
+}

src/elements/content-sidebar/activity-feed/comment/Comment.js

@@ -168,6 +168,7 @@ class Comment extends React.Component<Props, State> {
                                 >
                                     {canResolve && isResolved && (
                                         <MenuItem
+                                            className="bcs-Comment-unresolveComment"
                                             data-resin-target={ACTIVITY_TARGETS.COMMENT_OPTIONS_EDIT}
                                             data-testid="unresolve-comment"
                                             onClick={() => this.handleStatusUpdate(COMMENT_STATUS_OPEN)}

src/elements/content-sidebar/activity-feed/comment/Comment.scss

@@ -37,3 +37,7 @@
         border-top: none;
     }
 }
+
+.bcs-Comment-unresolveComment path {
+    fill: $bdl-gray;
+}

src/elements/content-sidebar/activity-feed/common/activity-status/ActivityStatus.scss

@@ -1,6 +1,6 @@
 @import '../../../../../styles/variables';
 
 .bcs-ActivityStatus {
-    margin-top: 5 * $bdl-grid-unit;
+    margin-top: 4 * $bdl-grid-unit;
     margin-bottom: 3 * $bdl-grid-unit;
 }