From b59a94e23db7aea39c77814466396a81abdbf5e4 Mon Sep 17 00:00:00 2001 From: Rob de Kort Date: Tue, 2 Nov 2021 09:19:34 +0100 Subject: [PATCH] v3.25.0 --- .gitignore | 5 +- CHANGELOG.md | 8 ++ content/globals/social_media.yaml | 6 +- dev/CHANGELOG.md | 8 ++ .../blueprints/globals/social_media.yaml | 73 ++++++++++++------- resources/svg/email.svg | 1 + resources/views/layout/_footer.antlers.html | 2 +- 7 files changed, 67 insertions(+), 36 deletions(-) create mode 100644 resources/svg/email.svg diff --git a/.gitignore b/.gitignore index 3ebe3a1e8..40e8eeabb 100644 --- a/.gitignore +++ b/.gitignore @@ -15,10 +15,7 @@ Homestead.json Homestead.yaml npm-debug.log yarn-error.log -# Uncomment the following lines if you build assets on your server (recommended): +# Comment the following lines if you don't compile your assets on your server: /public/js/ /public/css/ /public/mix-manifest.json - -# Ignore the exported kit. -/statamic-peak/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c2a1b59a..0639a51f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Release Notes +## 3.25.0 (2021-11-02) + +### What's improved +- Update social media globals. Rename fields and add email. #169 by @robdekort + +### What's fixed +- Change incorrect comment in `.gitignore`. + ## 3.24.0 (2021-10-30) ### What's improved diff --git a/content/globals/social_media.yaml b/content/globals/social_media.yaml index 604cdb82e..94c0afb9d 100644 --- a/content/globals/social_media.yaml +++ b/content/globals/social_media.yaml @@ -2,17 +2,17 @@ title: 'Social media' data: social_media: - - url: studio1902 + handle: studio1902 prefix: 'https://www.twitter.com/' type: twitter enabled: true - - url: studio1902/statamic-peak + handle: studio1902/statamic-peak prefix: 'https://www.github.com/' type: github enabled: true - - url: in/robdekort/ + handle: in/robdekort/ prefix: 'https://www.linkedin.com/' type: linkedin enabled: true diff --git a/dev/CHANGELOG.md b/dev/CHANGELOG.md index 7c2a1b59a..0639a51f4 100644 --- a/dev/CHANGELOG.md +++ b/dev/CHANGELOG.md @@ -1,5 +1,13 @@ # Release Notes +## 3.25.0 (2021-11-02) + +### What's improved +- Update social media globals. Rename fields and add email. #169 by @robdekort + +### What's fixed +- Change incorrect comment in `.gitignore`. + ## 3.24.0 (2021-10-30) ### What's improved diff --git a/resources/blueprints/globals/social_media.yaml b/resources/blueprints/globals/social_media.yaml index fe2718bbd..e106785e4 100644 --- a/resources/blueprints/globals/social_media.yaml +++ b/resources/blueprints/globals/social_media.yaml @@ -16,126 +16,143 @@ sections: display: Facebook fields: - - handle: url + handle: handle field: input_type: text type: text localizable: true listable: hidden prepend: 'https://www.facebook.com/' - display: URL + display: Handle validate: required - - + - handle: prefix - field: + field: type: hidden default: 'https://www.facebook.com/' + email: + display: Email + fields: + - + handle: handle + field: + input_type: text + type: text + localizable: true + listable: hidden + display: Email + validate: required + - + handle: prefix + field: + type: hidden + default: 'mailto:' instagram: display: Instagram fields: - - handle: url + handle: handle field: input_type: text type: text localizable: true listable: hidden prepend: 'https://www.instagram.com/' - display: URL + display: Handle validate: required - - + - handle: prefix - field: + field: type: hidden default: 'https://www.instagram.com/' linkedin: display: LinkedIn fields: - - handle: url + handle: handle field: input_type: text type: text localizable: true listable: hidden prepend: 'https://www.linkedin.com/' - display: URL + display: Handle validate: required - - + - handle: prefix - field: + field: type: hidden default: 'https://www.linkedin.com/' twitter: display: Twitter fields: - - handle: url + handle: handle field: input_type: text type: text localizable: true listable: hidden prepend: 'https://www.twitter.com/' - display: URL + display: Handle validate: required - - + - handle: prefix - field: + field: type: hidden default: 'https://www.twitter.com/' vimeo: display: Vimeo fields: - - handle: url + handle: handle field: input_type: text type: text localizable: true listable: hidden prepend: 'https://www.vimeo.com/' - display: URL + display: Handle validate: required - - + - handle: prefix - field: + field: type: hidden default: 'https://www.vimeo.com/' youtube: display: YouTube fields: - - handle: url + handle: handle field: input_type: text type: text localizable: true listable: hidden prepend: 'https://www.youtube.com/' - display: URL + display: Handle validate: required - - + - handle: prefix - field: + field: type: hidden default: 'https://www.youtube.com/' github: display: GitHub fields: - - handle: url + handle: handle field: input_type: text type: text localizable: true listable: hidden prepend: 'https://www.github.com/' - display: URL + display: Handle validate: required - - + - handle: prefix - field: + field: type: hidden default: 'https://www.github.com/' type: replicator diff --git a/resources/svg/email.svg b/resources/svg/email.svg new file mode 100644 index 000000000..94330101b --- /dev/null +++ b/resources/svg/email.svg @@ -0,0 +1 @@ + diff --git a/resources/views/layout/_footer.antlers.html b/resources/views/layout/_footer.antlers.html index 8d8597524..aacbffbb6 100644 --- a/resources/views/layout/_footer.antlers.html +++ b/resources/views/layout/_footer.antlers.html @@ -20,7 +20,7 @@ {{ if social_media:social_media }}
{{ social_media:social_media }} - {{ svg :src="type" class="w-3 h-3 overflow-visible text-neutral hover:text-primary fill-current" alt="" aria-hidden="true" }} + {{ svg :src="type" class="w-3 h-3 overflow-visible text-neutral hover:text-primary fill-current" alt="" aria-hidden="true" }} {{ /social_media:social_media }}
{{ /if }}