Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GH-437] Update files in icon directory to typescript #549

Merged
merged 4 commits into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions webapp/src/components/sidebar_right/gitlab_items.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,13 @@
// See LICENSE.txt for license information.

import React from 'react';
import {GitPullRequestIcon, IssueOpenedIcon, IconProps} from '@primer/octicons-react';
import {GitPullRequestIcon, IssueOpenedIcon, DotFillIcon, XIcon, MilestoneIcon, CheckIcon, IconProps} from '@primer/octicons-react';
import {makeStyleFromTheme, changeOpacity} from 'mattermost-redux/utils/theme_utils';
import {Badge, Tooltip, OverlayTrigger} from 'react-bootstrap';
import * as CSS from 'csstype';

import {useSelector} from 'react-redux';

import CrossIcon from 'src/images/icons/cross';
import DotIcon from 'src/images/icons/dot';
import TickIcon from 'src/images/icons/tick';
import SignIcon from 'src/images/icons/sign';
import {formatTimeSince} from 'src/utils/date_utils';
import {GitlabItemsProps, Label} from 'src/types/gitlab_items';
import {getSidebarExpanded} from 'src/selectors';
Expand Down Expand Up @@ -103,7 +99,7 @@ function GitlabItems({item, theme}: GitlabItemsProps) {
}),
}}
>
<SignIcon/>
<MilestoneIcon size='small'/>
{item.milestone.title}
</span>
);
Expand Down Expand Up @@ -140,7 +136,7 @@ function GitlabItems({item, theme}: GitlabItemsProps) {
<span
style={{...style.icon, ...style.iconSuccess}}
>
<TickIcon/>
<CheckIcon size='small'/>
</span>
);
break;
Expand All @@ -149,7 +145,7 @@ function GitlabItems({item, theme}: GitlabItemsProps) {
<span
style={{...style.icon, ...style.iconPending}}
>
<DotIcon/>
<DotFillIcon size='small'/>
</span>
);
break;
Expand All @@ -158,7 +154,7 @@ function GitlabItems({item, theme}: GitlabItemsProps) {
<span
style={{...style.icon, ...style.iconFailed}}
>
<CrossIcon/>
<XIcon size='small'/>
</span>
);
}
Expand Down
9 changes: 0 additions & 9 deletions webapp/src/images/icons/changes_requested.jsx

This file was deleted.

9 changes: 0 additions & 9 deletions webapp/src/images/icons/cross.jsx

This file was deleted.

9 changes: 0 additions & 9 deletions webapp/src/images/icons/dot.jsx

This file was deleted.

9 changes: 0 additions & 9 deletions webapp/src/images/icons/sign.jsx

This file was deleted.

9 changes: 0 additions & 9 deletions webapp/src/images/icons/tick.jsx

This file was deleted.

Loading