Skip to content

Commit feba414

Browse files
committed
chore: replace nrk-coreicons with fontawesome
1 parent 3c2c107 commit feba414

7 files changed

Lines changed: 11 additions & 25 deletions

File tree

packages/webui/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
"@fortawesome/free-solid-svg-icons": "^6.7.2",
3838
"@fortawesome/react-fontawesome": "^0.2.2",
3939
"@jstarpl/react-contextmenu": "^2.15.1",
40-
"@nrk/core-icons": "^9.6.0",
4140
"@popperjs/core": "^2.11.8",
4241
"@sofie-automation/blueprints-integration": "26.3.0-0",
4342
"@sofie-automation/corelib": "26.3.0-0",

packages/webui/src/client/lib/ModalDialog.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useLayoutEffect, useRef } from 'react'
2-
import * as CoreIcons from '@nrk/core-icons/jsx'
2+
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
33
import Escape from './Escape.js'
44
// @ts-expect-error type linking issue
55
import FocusBounder from 'react-focus-bounder'
@@ -164,7 +164,7 @@ export function ModalDialog({
164164
onKeyUp={emulateClick}
165165
aria-label={t('Dismiss')}
166166
>
167-
<CoreIcons.NrkClose />
167+
<FontAwesomeIcon icon="close" size="xl" className="mt-2" />
168168
</button>
169169
</Modal.Title>
170170
</Modal.Header>

packages/webui/src/client/lib/notifications/NotificationCenterPanel.tsx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react'
2-
import * as CoreIcon from '@nrk/core-icons/jsx'
2+
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
33
import ClassNames from 'classnames'
44
import { motion, AnimatePresence, HTMLMotionProps } from 'motion/react'
55
import { translateWithTracker, Translated, useTracker } from '../ReactMeteorData/ReactMeteorData.js'
@@ -88,12 +88,7 @@ class NotificationPopUp extends React.Component<IPopUpProps> {
8888
className="btn btn-default notification-pop-up__actions--button"
8989
onClick={(e) => this.triggerEvent(defaultAction, e)}
9090
>
91-
<CoreIcon.NrkArrowLeft
92-
className="icon"
93-
width="1em"
94-
height="1em"
95-
style={{ verticalAlign: 'middle', marginTop: '-0.1em', marginRight: '-0.4em' }}
96-
/>
91+
<FontAwesomeIcon icon="arrow-left" size="xs" />
9792
<span className="label">{defaultAction.label}</span>
9893
</button>
9994
</div>
@@ -133,7 +128,7 @@ class NotificationPopUp extends React.Component<IPopUpProps> {
133128
}}
134129
aria-label={i18nTranslator('Dismiss')}
135130
>
136-
{this.props.item.persistent ? <CollapseChevrons /> : <CoreIcon.NrkClose id="nrk-close" />}
131+
{this.props.item.persistent ? <CollapseChevrons /> : <FontAwesomeIcon icon="close" />}
137132
</button>
138133
</ContextMenuTrigger>
139134
)}

packages/webui/src/client/lib/ui/containers/modals/Modal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react'
22
import type { Sorensen } from '@sofie-automation/sorensen'
3-
import * as CoreIcons from '@nrk/core-icons/jsx'
3+
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
44
import Escape from './../../../Escape.js'
55

66
import { SorensenContext } from '../../../SorensenContext.js'
@@ -101,7 +101,7 @@ export class Modal extends React.Component<React.PropsWithChildren<IModalAttribu
101101
<div className="flex-col horizontal-align-right vertical-align-middle">
102102
<p>
103103
<button className="action-btn" onClick={this.handleDiscard}>
104-
<CoreIcons.NrkClose />
104+
<FontAwesomeIcon icon="close" size="xl" className="mt-2" />
105105
</button>
106106
</p>
107107
</div>

packages/webui/src/client/ui/RundownView/RundownHeader/RundownHeader.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useCallback, useContext, useEffect, useState } from 'react'
22
import { useTranslation } from 'react-i18next'
3-
import * as CoreIcon from '@nrk/core-icons/jsx'
3+
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
44
import ClassNames from 'classnames'
55
import Escape from '../../../lib/Escape'
66
import Tooltip from 'rc-tooltip'
@@ -219,7 +219,7 @@ export function RundownHeader({
219219
<div className="flex-col right horizontal-align-right">
220220
<div className="links close">
221221
<NavLink to="/rundowns" title={t('Exit')}>
222-
<CoreIcon.NrkClose />
222+
<FontAwesomeIcon icon="close" size="xl" />
223223
</NavLink>
224224
</div>
225225
</div>

packages/webui/src/client/ui/UserEditOperations/PropertiesPanel.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import classNames from 'classnames'
1717
import { useTranslation } from 'react-i18next'
1818
import { useSelectedElements, useSelectedElementsContext } from '../RundownView/SelectedElementsContext.js'
1919
import { RundownUtils } from '../../lib/rundown.js'
20-
import * as CoreIcon from '@nrk/core-icons/jsx'
20+
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
2121
import { useCallback, useMemo, useState } from 'react'
2222
import { SchemaFormWithState } from '../../lib/forms/SchemaFormWithState.js'
2323
import { translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
@@ -154,7 +154,7 @@ export function PropertiesPanel(): JSX.Element {
154154
title={t('Close Properties Panel')}
155155
onClick={clearSelections}
156156
>
157-
<CoreIcon.NrkClose width="1em" height="1em" />
157+
<FontAwesomeIcon icon="close" size="lg" />
158158
</button>
159159
</div>
160160

packages/yarn.lock

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5578,13 +5578,6 @@ __metadata:
55785578
languageName: node
55795579
linkType: hard
55805580

5581-
"@nrk/core-icons@npm:^9.6.0":
5582-
version: 9.6.0
5583-
resolution: "@nrk/core-icons@npm:9.6.0"
5584-
checksum: 10/0384037b0b7ec21ea6bc516685a510e7f0c0acbcc86549365fb8fd90aceb15129327e59a3a36944bba93c5453f1d1482f31002311e85d1f78bd5f7ca2100894b
5585-
languageName: node
5586-
linkType: hard
5587-
55885581
"@nuxt/opencollective@npm:0.4.1":
55895582
version: 0.4.1
55905583
resolution: "@nuxt/opencollective@npm:0.4.1"
@@ -7051,7 +7044,6 @@ __metadata:
70517044
"@fortawesome/free-solid-svg-icons": "npm:^6.7.2"
70527045
"@fortawesome/react-fontawesome": "npm:^0.2.2"
70537046
"@jstarpl/react-contextmenu": "npm:^2.15.1"
7054-
"@nrk/core-icons": "npm:^9.6.0"
70557047
"@popperjs/core": "npm:^2.11.8"
70567048
"@sofie-automation/blueprints-integration": "npm:26.3.0-0"
70577049
"@sofie-automation/corelib": "npm:26.3.0-0"

0 commit comments

Comments
 (0)