Skip to content

Commit 2f6b36b

Browse files
authored
Merge pull request #2644 from jplag/report-viewer/font-awesome-fix
Avoid adding icons to font awesome library
2 parents 551782c + f5c255f commit 2f6b36b

6 files changed

Lines changed: 31 additions & 35 deletions

File tree

report-viewer/package-lock.json

Lines changed: 24 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

report-viewer/report-viewer/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"preview": "vite preview"
1515
},
1616
"dependencies": {
17-
"@fortawesome/free-brands-svg-icons": "^7.0.1",
18-
"@fortawesome/free-solid-svg-icons": "^7.0.0",
17+
"@fortawesome/free-brands-svg-icons": "^7.1.0",
18+
"@fortawesome/free-solid-svg-icons": "^7.1.0",
1919
"@fortawesome/vue-fontawesome": "^3.1.1",
2020
"@jplag/model": "../model",
2121
"@jplag/parser": "../parser",

report-viewer/ui-components/base/SearchBarComponent.vue

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<template>
55
<Interactable class="flex flex-row items-center space-x-2 px-2 py-2">
66
<FontAwesomeIcon
7-
:icon="['fas', 'magnifying-glass']"
7+
:icon="faMagnifyingGlass"
88
class="text-gray-500"
99
@click="emit('searchClicked', value)"
1010
/>
@@ -20,13 +20,10 @@
2020

2121
<script setup lang="ts">
2222
import Interactable from './InteractableComponent.vue'
23-
import { library } from '@fortawesome/fontawesome-svg-core'
2423
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
2524
import { faMagnifyingGlass } from '@fortawesome/free-solid-svg-icons'
2625
import InfoIcon from './InfoIcon.vue'
2726
28-
library.add(faMagnifyingGlass)
29-
3027
defineProps({
3128
placeholder: {
3229
type: String,

report-viewer/ui-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"vue-virtual-scroller": "^2.0.0-beta.8"
1414
},
1515
"peerDependencies": {
16-
"@fortawesome/free-solid-svg-icons": "^7.0.0",
16+
"@fortawesome/free-solid-svg-icons": "^7.1.0",
1717
"@fortawesome/vue-fontawesome": "^3.1.1",
1818
"pinia": "^3.0.3",
1919
"tailwindcss": "^4.1.12",

report-viewer/ui-components/widget/NameElement.vue

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,15 @@
77
class="invisible absolute top-0 right-0 z-10 flex h-full cursor-pointer items-center p-2 delay-0 group-hover:visible group-hover:delay-100"
88
@click="(e) => emit('changeAnonymous', e)"
99
>
10-
<FontAwesomeIcon
11-
class="text-gray-500"
12-
:icon="isAnonymous ? ['fas', 'eye'] : ['fas', 'eye-slash']"
13-
/>
10+
<FontAwesomeIcon class="text-gray-500" :icon="isAnonymous ? faEye : faEyeSlash" />
1411
</div>
1512
</div>
1613
</template>
1714

1815
<script setup lang="ts">
1916
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
20-
import { library } from '@fortawesome/fontawesome-svg-core'
2117
import { faEye, faEyeSlash } from '@fortawesome/free-solid-svg-icons'
2218
23-
library.add(faEye)
24-
library.add(faEyeSlash)
25-
2619
defineProps({
2720
displayedName: {
2821
type: String,

report-viewer/ui-components/widget/fileDisplaying/FilesContainer.vue

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
>
1515
</div>
1616
<ButtonComponent v-if="allCollapsed" class="space-x-2 print:hidden" @click="expandAll()"
17-
><FontAwesomeIcon :icon="['fas', 'expand-alt']" />
17+
><FontAwesomeIcon :icon="faExpandAlt" />
1818
<p>Expand All</p></ButtonComponent
1919
>
2020
<ButtonComponent
2121
v-else
2222
class="w-full space-x-2 md:max-w-fit print:hidden"
2323
@click="collapseAll()"
24-
><FontAwesomeIcon :icon="['fas', 'compress-alt']" />
24+
><FontAwesomeIcon :icon="faCompressAlt" />
2525
<p>Collapse All</p></ButtonComponent
2626
>
2727
</div>
@@ -59,13 +59,9 @@ import { VueDraggableNext } from 'vue-draggable-next'
5959
import { computed, nextTick, ref, type PropType, type Ref } from 'vue'
6060
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
6161
import { faCompressAlt, faExpandAlt } from '@fortawesome/free-solid-svg-icons'
62-
import { library } from '@fortawesome/fontawesome-svg-core'
6362
import { FileSortingOptions } from './FileSortingOptions'
6463
import MetricIcon from '../MetricIcon.vue'
6564
66-
library.add(faCompressAlt)
67-
library.add(faExpandAlt)
68-
6965
const props = defineProps({
7066
/**
7167
* Files of the submission.

0 commit comments

Comments
 (0)