Skip to content
This repository was archived by the owner on Jan 22, 2026. It is now read-only.

Add gift emoji #120

Merged
sheridanvk merged 11 commits into from
Aug 4, 2020
Merged

Add gift emoji #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4ba50b7
Merge branch 'master' of https://github.com/glitchdotcom/shared-compo…
May 5, 2020
8a07743
👸🍡 Checkpoint
Jun 9, 2020
12ffdcb
Merge branch 'master' of https://github.com/glitchdotcom/shared-compo…
Jun 11, 2020
3c9a105
👨🚅 Checkpoint
Jun 12, 2020
d3d1358
Merge branch 'master' of https://github.com/glitchdotcom/shared-compo…
Jun 17, 2020
36fdd55
Merge branch 'master' of https://github.com/glitchdotcom/shared-compo…
Jul 9, 2020
e902c31
🐢🎳 Checkpoint
Jul 10, 2020
388448d
🎣🚃 Checkpoint
Jul 23, 2020
ca220ff
Merge branch 'master' of https://github.com/glitchdotcom/shared-compo…
Aug 4, 2020
d695720
🎠📠 Checkpoint
Aug 4, 2020
4998515
Add Gift icon and fix npm audit warnings
Aug 4, 2020
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
6 changes: 6 additions & 0 deletions .glitch-assets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,9 @@
{"name":"footer_icon_dev.png","date":"2020-03-12T17:33:11.207Z","url":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Ffooter_icon_dev.png","type":"image/png","size":641,"imageWidth":48,"imageHeight":48,"thumbnail":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Ffooter_icon_dev.png","thumbnailWidth":48,"thumbnailHeight":48,"uuid":"lje5yHtXnqOmHRxb"}
{"name":"footer_icon_linkedin.png","date":"2020-03-12T17:33:13.831Z","url":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Ffooter_icon_linkedin.png","type":"image/png","size":542,"imageWidth":48,"imageHeight":48,"thumbnail":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Ffooter_icon_linkedin.png","thumbnailWidth":48,"thumbnailHeight":48,"uuid":"CyhOLRNDF9dpFOQw"}
{"name":"icon_external.png","date":"2020-03-12T17:33:16.451Z","url":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Ficon_external.png","type":"image/png","size":284,"imageWidth":48,"imageHeight":48,"thumbnail":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Ficon_external.png","thumbnailWidth":48,"thumbnailHeight":48,"uuid":"uu8bnjx4SkXSFLc4"}
{"name":"sleeping-symbol_1f4a4.png","date":"2020-06-09T20:30:38.409Z","url":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Fsleeping-symbol_1f4a4.png","type":"image/png","size":567,"imageWidth":64,"imageHeight":64,"thumbnail":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Fsleeping-symbol_1f4a4.png","thumbnailWidth":64,"thumbnailHeight":64,"uuid":"SGbV1Luj3soie8rl"}
{"name":"high-voltage-sign_26a1.png","date":"2020-06-09T20:30:41.714Z","url":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Fhigh-voltage-sign_26a1.png","type":"image/png","size":833,"imageWidth":64,"imageHeight":64,"thumbnail":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Fhigh-voltage-sign_26a1.png","thumbnailWidth":64,"thumbnailHeight":64,"uuid":"RNU1ztiVLcDAOVBj"}
{"name":"rocket.png","date":"2020-06-12T18:14:40.393Z","url":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Frocket.png","type":"image/png","size":5958,"imageWidth":64,"imageHeight":64,"thumbnail":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Frocket.png","thumbnailWidth":64,"thumbnailHeight":64,"uuid":"7689z6Q0uv7OoN2z"}
{"name":"app-dashboard-promo-background.svg","date":"2020-07-10T05:55:37.842Z","url":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Fapp-dashboard-promo-background.svg","type":"image/svg+xml","size":5455,"imageWidth":455,"imageHeight":172,"thumbnail":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Fthumbnails%2Fapp-dashboard-promo-background.svg","thumbnailWidth":330,"thumbnailHeight":125,"uuid":"R4OD65aQW2S8Vip4"}
{"name":"Glitch-Error-Rainbow-Mug-hires.png","date":"2020-07-23T05:20:53.593Z","url":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2FGlitch-Error-Rainbow-Mug-hires.png","type":"image/png","size":170377,"imageWidth":2064,"imageHeight":1247,"thumbnail":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Fthumbnails%2FGlitch-Error-Rainbow-Mug-hires.png","thumbnailWidth":330,"thumbnailHeight":200,"uuid":"JwJpFAHr0wTqi4Zf"}
{"name":"gift.png","date":"2020-08-04T14:19:53.942Z","url":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Fgift.png","type":"image/png","size":6712,"imageWidth":64,"imageHeight":64,"thumbnail":"https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Fgift.png","thumbnailWidth":64,"thumbnailHeight":64,"uuid":"fOT0pySgjZNRue3E"}
Comment on lines +128 to +133
Copy link
Contributor

@Osmose Osmose Aug 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hrm, when I do PRs off a local copy instead of a remix I don't include asset changes, do you think that's a problem? Having them in the git repo doesn't really affect anything one way or another.

Copy link
Contributor Author

@sheridanvk sheridanvk Aug 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I'm not sure tbh, I just pulled this in because I had put the asset in there, but I agree it doesn't seem super critical. I cannot wait until assets are just files in projects ahhh

1 change: 1 addition & 0 deletions lib/icon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ const icons = {
fireEngine: 'https://cdn.glitch.com/e7e23ba6-c0ec-4a5a-8dcf-b6f61984cea8%2Ffireengine.png?v=1568142113308',
fishingPole: 'https://cdn.glitch.com/e7e23ba6-c0ec-4a5a-8dcf-b6f61984cea8%2Ffishing_pole.png?v=1568142113454',
framedPicture: 'https://cdn.glitch.com/e7e23ba6-c0ec-4a5a-8dcf-b6f61984cea8%2Fframed_picture.png?v=1568142113549',
gift: 'https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Fgift.png?v=1596550793942',
ghost: 'https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Fghost.png',
glitchLogo: 'https://cdn.glitch.com/4bca9911-a70a-46cd-b0b2-f1b103c832d9%2FglitchLogo.svg?v=1569963961866',
globeWithMeridians: 'https://cdn.glitch.com/d7f4f279-e13b-4330-8422-00b2d9211424%2Fglobe-with-meridians.png',
Expand Down
28 changes: 10 additions & 18 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.