Skip to content

Commit 4879e8f

Browse files
authored
Merge pull request #2 from Carifio24/logo-sizing
Sizing for credit logos
2 parents b979d19 + 4af0efd commit 4879e8f

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"dependencies": {
66
"@fortawesome/fontawesome-svg-core": "^6.5.1",
77
"@fortawesome/free-solid-svg-icons": "^6.5.1",
8-
"@fortawesome/vue-fontawesome": "^3.0.3",
8+
"@fortawesome/vue-fontawesome": "^3.0.6",
99
"@kyvg/vue3-notification": "^2.9.1",
1010
"@mdi/font": "^7.4.47",
1111
"@wwtelescope/engine-pinia": "^0.9.0",

src/components/CreditLogos.vue

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div id="logo-credits">
2+
<div id="logo-credits" :style="cssVars">
33
<div id="icons-container">
44
<a href="https://www.cosmicds.cfa.harvard.edu/" target="_blank" rel="noopener noreferrer"
55
><img alt="CosmicDS Logo" src="https://raw.githubusercontent.com/cosmicds/minids/main/assets/cosmicds_logo_for_dark_backgrounds.png"
@@ -17,40 +17,38 @@
1717
</div>
1818
</template>
1919

20-
2120
<script lang="ts">
22-
import { defineComponent, } from "vue";
21+
import { defineComponent } from "vue";
2322
2423
export default defineComponent({
2524
26-
2725
props: {
2826
visible: {
2927
type: Boolean,
3028
default: true
3129
},
32-
},
33-
34-
data() {
35-
return { };
36-
},
37-
38-
created() {
39-
return;
40-
},
41-
42-
methods: {
43-
30+
logoSize: {
31+
type: String,
32+
default: "5vmin"
33+
}
4434
},
4535
4636
computed: {
47-
4837
isMobile() {
4938
return (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent));
5039
},
40+
cssVars() {
41+
return {
42+
"--logo-size": this.logoSize,
43+
};
44+
}
5145
},
5246
53-
watch: {
54-
}
5547
});
56-
</script>
48+
</script>
49+
50+
<style>
51+
#logo-credits img {
52+
height: var(--logo-size);
53+
}
54+
</style>

src/components/IconButton.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ import { defineComponent } from "vue";
4545
import { VTooltip } from "vuetify/components/VTooltip";
4646
import { VIcon } from "vuetify/components/VIcon";
4747
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
48-
import type { FontAwesomeIconProps } from "@fortawesome/vue-fontawesome/";
48+
49+
// We need to do this because FontAwesome doesn't export the prop types
50+
type FontAwesomeIconProps = InstanceType<typeof FontAwesomeIcon>["$props"];
4951
5052
type SizeType = Extract<FontAwesomeIconProps, 'size'>;
5153

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ __metadata:
264264
dependencies:
265265
"@fortawesome/fontawesome-svg-core": ^6.5.1
266266
"@fortawesome/free-solid-svg-icons": ^6.5.1
267-
"@fortawesome/vue-fontawesome": ^3.0.3
267+
"@fortawesome/vue-fontawesome": ^3.0.6
268268
"@kyvg/vue3-notification": ^2.9.1
269269
"@mdi/font": ^7.4.47
270270
"@types/leaflet": ^1.9.3
@@ -364,13 +364,13 @@ __metadata:
364364
languageName: node
365365
linkType: hard
366366

367-
"@fortawesome/vue-fontawesome@npm:^3.0.3":
368-
version: 3.0.5
369-
resolution: "@fortawesome/vue-fontawesome@npm:3.0.5"
367+
"@fortawesome/vue-fontawesome@npm:^3.0.6":
368+
version: 3.0.6
369+
resolution: "@fortawesome/vue-fontawesome@npm:3.0.6"
370370
peerDependencies:
371371
"@fortawesome/fontawesome-svg-core": ~1 || ~6
372372
vue: ">= 3.0.0 < 4"
373-
checksum: 741222a35bd189e4e7957ad77ee0e557cb3281c99f6e7b379713c2a4bb2f65f0945c4ae60fdcc8d49721cc5f1a8d874bf6e1b58a3688002c3170e4376b94db02
373+
checksum: 0ae311ed998660ae7b460ec03e5fd5f64268dd841ac000bb67172211fa3f36b2df46d6ffb95de608f716664ebc07048a17d5da8b4f93f2ccddc8a054b410bcaf
374374
languageName: node
375375
linkType: hard
376376

0 commit comments

Comments
 (0)