diff --git a/admin/src/components/ActionButton/styles.js b/admin/src/components/ActionButton/styles.js index 84902a5..fe9751c 100644 --- a/admin/src/components/ActionButton/styles.js +++ b/admin/src/components/ActionButton/styles.js @@ -4,7 +4,7 @@ import { Button } from '@strapi/design-system/Button'; export const ActionButton = styled(Button)` padding: 7px 16px; - margin-left: .5rem; + margin-left: ${({ isSingle }) => isSingle ? '0' : '.5rem'}; white-space: nowrap; `; diff --git a/admin/src/components/DiscussionThreadItemActions/styles.js b/admin/src/components/DiscussionThreadItemActions/styles.js index a04f6ab..bab6dc0 100644 --- a/admin/src/components/DiscussionThreadItemActions/styles.js +++ b/admin/src/components/DiscussionThreadItemActions/styles.js @@ -1,12 +1,7 @@ import styled from 'styled-components'; import { Box } from '@strapi/design-system/Box'; -import { StatusBadge } from '../StatusBadge/styles'; export const DiscussionThreadItemActionsWrapper = styled(Box)` margin-left: 1rem; - align-items: start; - - ${StatusBadge} { - margin-top: .05rem; - } + align-items: flex-start; `; \ No newline at end of file diff --git a/admin/src/components/ReportsReviewTable/index.js b/admin/src/components/ReportsReviewTable/index.js index d7d3e87..bded466 100644 --- a/admin/src/components/ReportsReviewTable/index.js +++ b/admin/src/components/ReportsReviewTable/index.js @@ -8,7 +8,6 @@ import { useIntl } from 'react-intl'; import PropTypes from 'prop-types'; import { isEmpty } from 'lodash'; - import { Button } from '@strapi/design-system/Button'; import { BaseCheckbox } from '@strapi/design-system/BaseCheckbox'; import { Flex } from '@strapi/design-system/Flex'; import { Table, Thead, Tbody, TFooter, Tr, Th, Td } from '@strapi/design-system/Table'; @@ -19,6 +18,7 @@ import { useOverlayBlocker } from '@strapi/helper-plugin'; import { getMessage } from '../../utils'; import { REPORT_REASON, REPORT_STATUS } from '../../utils/constants'; import StatusBadge from '../StatusBadge'; +import { ActionButton } from '../ActionButton/styles'; const ReportsReviewTable = ({ commentId, @@ -129,7 +129,13 @@ const ReportsReviewTable = ({ { canReviewReports && ( { !entry.resolved && ( - + handleClickResolve(entry.id)} + startIcon={} + variant="success"> + { getMessage('page.details.panel.discussion.warnings.reports.dialog.actions.resolve', 'resolve') } + ) } )} )} diff --git a/admin/src/components/StatusBadge/styles.js b/admin/src/components/StatusBadge/styles.js index 699d6a5..6d982be 100644 --- a/admin/src/components/StatusBadge/styles.js +++ b/admin/src/components/StatusBadge/styles.js @@ -2,7 +2,7 @@ import styled from 'styled-components'; import { Badge } from '@strapi/design-system/Badge'; export const StatusBadge = styled(Badge)` - padding: 4px 8px; + padding: 5px 8px; border: 1px ${ ({ theme, color }) => theme.colors[`${color}200`] } solid; overflow: hidden;