Skip to content

Commit 3a83c03

Browse files
iacopoleaiacopolea
committed
fix: combing with design team
1 parent 28f2e92 commit 3a83c03

File tree

15 files changed

+49
-61
lines changed

15 files changed

+49
-61
lines changed

‎src/common/components/BugDetail/Meta/index.tsx‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,30 +72,34 @@ export default ({
7272
</XL>
7373
<MD
7474
style={{
75-
color: globalTheme.palette.grey[600],
75+
color: globalTheme.palette.grey[700],
7676
marginBottom: globalTheme.space.md,
7777
}}
7878
>
7979
{bug.title.context ? bug.title.context.join(', ') : null}
8080
</MD>
8181
<BugInfo>
82-
<SM style={{ textTransform: 'capitalize' }}>{bug.type.name}</SM>
83-
<Pipe style={{ height: globalTheme.lineHeights.md }} />
84-
<Tag hue="white">
82+
<SM
83+
isBold
84+
style={{
85+
textTransform: 'capitalize',
86+
color: globalTheme.palette.grey[700],
87+
}}
88+
>
89+
{bug.type.name}
90+
</SM>
91+
<Pipe size="regular" style={{ height: globalTheme.lineHeights.md }} />
92+
<Tag hue="white" style={{ textTransform: 'capitalize' }}>
8593
<Tag.Avatar>{getDeviceIcon(bug.device.type)}</Tag.Avatar>
86-
<SM style={{ textTransform: 'capitalize' }}>
87-
{bug.device.type === 'desktop'
88-
? bug.device.desktop_type
89-
: `${bug.device.manufacturer} ${bug.device.model}`}
90-
</SM>
94+
{bug.device.type === 'desktop'
95+
? bug.device.desktop_type
96+
: `${bug.device.manufacturer} ${bug.device.model}`}
9197
</Tag>
92-
<Tag hue="white">
98+
<Tag hue="white" style={{ textTransform: 'capitalize' }}>
9399
<Tag.Avatar>
94100
<OSIcon />
95101
</Tag.Avatar>
96-
<SM style={{ textTransform: 'capitalize' }}>
97-
{bug.device.os} {bug.device.os_version}
98-
</SM>
102+
{bug.device.os} {bug.device.os_version}
99103
</Tag>
100104
</BugInfo>
101105
</Container>

‎src/common/components/tag/SeverityTag.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,23 @@ interface SeverityTagProps {
88
counter?: number;
99
hasBackground?: boolean;
1010
size?: 'small' | 'medium' | 'large';
11+
isRegular?: boolean;
1112
}
1213

1314
export const SeverityTag = ({
1415
severity,
1516
counter,
1617
hasBackground,
1718
size,
19+
isRegular,
1820
}: SeverityTagProps) => (
1921
<Tag
2022
size={size}
2123
color={theme.colors.bySeverity[severity]}
2224
hue={
2325
hasBackground ? `${theme.colors.bySeverity[severity]}14` : 'rgba(0,0,0,0)'
2426
}
27+
isRegular={isRegular}
2528
>
2629
{capitalizeFirstLetter(severity)}
2730
{typeof counter !== 'undefined' && (

‎src/pages/Bugs/Content/BugsTable/utils/mapBugsToTableData.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export const mapBugsToTableData = (bugs: TableBugType[], t: TFunction) => {
3434
severity: (
3535
<SeverityTag
3636
hasBackground
37+
isRegular={!isPillBold}
3738
severity={bug.severity.name.toLowerCase() as Severities}
3839
/>
3940
),

‎src/pages/Bugs/PageHeader/Tools/UniqueBugsCounter.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Trans } from 'react-i18next';
2-
import { SM, Span } from '@appquality/unguess-design-system';
2+
import { MD, Span } from '@appquality/unguess-design-system';
33
import styled from 'styled-components';
44
import { theme as globalTheme } from 'src/app/theme';
55
import { useUniqueBugs } from 'src/pages/Campaign/widgets/UniqueBugs/useUniqueBugs';
@@ -19,7 +19,7 @@ export const UniqueBugsCounter = ({
1919
return (
2020
<CounterContainer {...props}>
2121
<Trans i18nKey="__BUGS_PAGE_HEADER_UNIQUE_BUGS_ON_TOTAL">
22-
<SM>
22+
<MD>
2323
<Span isBold style={{ color: globalTheme.colors.primaryHue }}>
2424
{{ numerator: uniqueBugs }}{' '}
2525
</Span>
@@ -38,7 +38,7 @@ export const UniqueBugsCounter = ({
3838
{' '}
3939
of which
4040
</Span>
41-
</SM>
41+
</MD>
4242
</Trans>
4343
</CounterContainer>
4444
);

‎src/pages/Campaign/pageHeader/Tags/deviceTags/DesktopTag.tsx‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
import { useTranslation } from 'react-i18next';
22
import { Tag } from '@appquality/unguess-design-system';
3-
import { theme } from 'src/app/theme';
43
import { ReactComponent as DesktopIcon } from 'src/assets/icons/pill-icon-desktop.svg';
54

65
export const DesktopTag = () => {
76
const { t } = useTranslation();
87
return (
9-
<Tag
10-
id="pill-desktop-header"
11-
size="large"
12-
color={theme.palette.azure[600]}
13-
hue="rgba(0,0,0,0)"
14-
>
8+
<Tag id="pill-desktop-header" size="large" hue="rgba(0,0,0,0)">
159
<Tag.Avatar>
1610
<DesktopIcon />
1711
</Tag.Avatar>

‎src/pages/Campaign/pageHeader/Tags/deviceTags/SmartphoneTag.tsx‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
import { useTranslation } from 'react-i18next';
2-
import { theme } from 'src/app/theme';
32
import { ReactComponent as SmartphoneIcon } from 'src/assets/icons/pill-icon-smartphone.svg';
43
import { Tag } from '@appquality/unguess-design-system';
54

65
export const SmartphoneTag = () => {
76
const { t } = useTranslation();
87
return (
9-
<Tag
10-
id="pill-smartphone-header"
11-
color={theme.palette.azure[600]}
12-
size="large"
13-
hue="rgba(0,0,0,0)"
14-
>
8+
<Tag id="pill-smartphone-header" size="large" hue="rgba(0,0,0,0)">
159
<Tag.Avatar>
1610
<SmartphoneIcon />
1711
</Tag.Avatar>

‎src/pages/Campaign/pageHeader/Tags/deviceTags/TabletTag.tsx‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
import { useTranslation } from 'react-i18next';
2-
import { theme } from 'src/app/theme';
32
import { ReactComponent as TabletIcon } from 'src/assets/icons/pill-icon-tablet.svg';
43
import { Tag } from '@appquality/unguess-design-system';
54

65
export const TabletTag = () => {
76
const { t } = useTranslation();
87
return (
9-
<Tag
10-
id="pill-tablet-header"
11-
color={theme.palette.azure[600]}
12-
size="large"
13-
hue="rgba(0,0,0,0)"
14-
>
8+
<Tag id="pill-tablet-header" size="large" hue="rgba(0,0,0,0)">
159
<Tag.Avatar>
1610
<TabletIcon />
1711
</Tag.Avatar>

‎src/pages/Campaign/widgets/IncomingBugs/DuplicateBugs/index.tsx‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,15 @@ const DuplicateBugs = ({ campaignId }: { campaignId: number }) => {
5252
{bug.title.context &&
5353
bug.title.context.length > 0 &&
5454
bug.title.context.map((context) => (
55-
<Tag isRegular key={`${bug.id}_${context}`}>
56-
{context}
57-
</Tag>
55+
<Tag key={`${bug.id}_${context}`}>{context}</Tag>
5856
))}
59-
<Tag isRegular>
57+
<Tag>
6058
{t(
6159
'__CAMPAIGN_WIDGET_INCOMING_BUGS_MOST_SUBMITTED_DUPLICATES_LABEL'
6260
)}
6361
: {bug.duplicates}
6462
</Tag>
65-
<Tag isRegular>{bug.type.name}</Tag>
63+
<Tag>{bug.type.name}</Tag>
6664
{severity && (
6765
<SeverityTag hasBackground severity={severity} />
6866
)}

‎src/pages/Campaign/widgets/IncomingBugs/UnreadBugs/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ const UnreadBugs = ({ campaignId }: { campaignId: number }) => {
9797
<BugCard.Footer>
9898
{bug.titleContext &&
9999
bug.titleContext.map((context) => (
100-
<Tag isRegular>{context}</Tag>
100+
<Tag>{context}</Tag>
101101
))}
102-
<Tag isRegular>{bug.type}</Tag>
102+
<Tag>{bug.type}</Tag>
103103
{severity && (
104104
<SeverityTag hasBackground severity={severity} />
105105
)}

‎src/pages/ExpressWizard/drawer.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export const ExpressDrawer = ({ onCtaClick }: { onCtaClick: () => void }) => {
114114
{expressData.tags.map((tag: TagItem) => {
115115
const icon = extractStrapiData(tag.icon);
116116
return (
117-
<StyledTag hue={theme.palette.grey[100]} size="large">
117+
<StyledTag hue="rgba(0,0,0,0)">
118118
<StyledTag.Avatar>
119119
<img
120120
key={`tag_${tag.id}`}

0 commit comments

Comments
 (0)