From 8a218a223a0ede5713d8f01dd5c30e26b5814824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Andrei?= Date: Fri, 4 Aug 2023 12:12:34 -0300 Subject: [PATCH 1/2] Add Flickr and Soundcloud icons --- news/4.feature | 1 + src/components/SocialNetworkIcon/SocialNetworkIcon.jsx | 4 ++++ src/icons/flickr.svg | 1 + src/icons/soundcloud.svg | 1 + 4 files changed, 7 insertions(+) create mode 100644 news/4.feature create mode 100644 src/icons/flickr.svg create mode 100644 src/icons/soundcloud.svg diff --git a/news/4.feature b/news/4.feature new file mode 100644 index 0000000..080a940 --- /dev/null +++ b/news/4.feature @@ -0,0 +1 @@ +Add Flickr and Soundcloud icons [@ericof] diff --git a/src/components/SocialNetworkIcon/SocialNetworkIcon.jsx b/src/components/SocialNetworkIcon/SocialNetworkIcon.jsx index 268ef34..acddeed 100644 --- a/src/components/SocialNetworkIcon/SocialNetworkIcon.jsx +++ b/src/components/SocialNetworkIcon/SocialNetworkIcon.jsx @@ -5,6 +5,7 @@ import cx from 'classnames'; import discordIcon from '../../icons/discord.svg'; import dockerIcon from '../../icons/docker.svg'; import facebookIcon from '../../icons/facebook.svg'; +import flickrIcon from '../../icons/flickr.svg'; import githubIcon from '../../icons/github.svg'; import gitlabIcon from '../../icons/gitlab.svg'; import instagramIcon from '../../icons/instagram.svg'; @@ -12,6 +13,7 @@ import linkedinIcon from '../../icons/linkedin.svg'; import mastodonIcon from '../../icons/mastodon.svg'; import mediumIcon from '../../icons/medium.svg'; import slackIcon from '../../icons/slack.svg'; +import soundcloudIcon from '../../icons/soundcloud.svg'; import spotifyIcon from '../../icons/spotify.svg'; import stackoverflowIcon from '../../icons/stack-overflow.svg'; import telegramIcon from '../../icons/telegram.svg'; @@ -28,6 +30,7 @@ const ICONS = { discord: discordIcon, docker: dockerIcon, facebook: facebookIcon, + flickr: flickrIcon, github: githubIcon, gitlab: gitlabIcon, instagram: instagramIcon, @@ -35,6 +38,7 @@ const ICONS = { mastodon: mastodonIcon, medium: mediumIcon, slack: slackIcon, + soundcloud: soundcloudIcon, spotify: spotifyIcon, stackoverflow: stackoverflowIcon, telegram: telegramIcon, diff --git a/src/icons/flickr.svg b/src/icons/flickr.svg new file mode 100644 index 0000000..7879a4b --- /dev/null +++ b/src/icons/flickr.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/soundcloud.svg b/src/icons/soundcloud.svg new file mode 100644 index 0000000..4a0545a --- /dev/null +++ b/src/icons/soundcloud.svg @@ -0,0 +1 @@ + \ No newline at end of file From 7ac16db90549981f31cd6892391ab550b0e5d914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Andrei?= Date: Fri, 4 Aug 2023 12:25:40 -0300 Subject: [PATCH 2/2] Fix changelog.yml GitHub actions workflow --- .github/workflows/changelog.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 1facd81..f3516f2 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -34,8 +34,8 @@ jobs: # Fetch the pull request' base branch so towncrier will be able to # compare the current branch with the base branch. # Source: https://github.com/actions/checkout/#fetch-all-branches. - git fetch --no-tags origin master - towncrier check --compare-with origin/master + git fetch --no-tags origin main + towncrier check --compare-with origin/main env: BASE_BRANCH: ${{ github.base_ref }} if: github.event_name == 'pull_request'