From c72ebf51a5b4c7e5d8ca3073b90fe2eba39e5014 Mon Sep 17 00:00:00 2001 From: Amaresh S M Date: Sat, 10 Dec 2022 15:04:43 +0530 Subject: [PATCH 1/6] feat: add mastodon link --- package-lock.json | 2 +- src/_data/links.json | 1 + src/_data/sites/de.yml | 1 + src/_data/sites/en.yml | 1 + src/_data/sites/es.yml | 1 + src/_data/sites/fr.yml | 1 + src/_data/sites/hi.yml | 1 + src/_data/sites/ja.yml | 1 + src/_data/sites/pt-br.yml | 1 + src/_data/sites/zh-hans.yml | 1 + src/_includes/components/social-icons.html | 45 +++++++++++++++++----- src/playground/components/SocialIcons.js | 11 ++++++ 12 files changed, 56 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7cf1d7eb7..b14824a68 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "eslint.org", "version": "1.0.0", - "license": "ISC", + "license": "Apache-2.0", "dependencies": { "@codemirror/highlight": "0.19.7", "@codemirror/history": "0.19.2", diff --git a/src/_data/links.json b/src/_data/links.json index 445d4f31c..9d44a2797 100644 --- a/src/_data/links.json +++ b/src/_data/links.json @@ -3,6 +3,7 @@ "twitter": "https://twitter.com/geteslint", "chat": "https://eslint.org/chat", "group": "https://groups.google.com/group/eslint", + "mastodon": "https://fosstodon.org/@eslint", "blog": "/blog", "docs": "/docs", diff --git a/src/_data/sites/de.yml b/src/_data/sites/de.yml index ae68fc7df..79305e243 100644 --- a/src/_data/sites/de.yml +++ b/src/_data/sites/de.yml @@ -83,6 +83,7 @@ footer: chat: Discord mailing_list: Google Group github: GitHub + mastodon: Mastodon theme_switcher: title: Themenauswahl light: Hell diff --git a/src/_data/sites/en.yml b/src/_data/sites/en.yml index be80373f0..2f97d4299 100644 --- a/src/_data/sites/en.yml +++ b/src/_data/sites/en.yml @@ -89,6 +89,7 @@ footer: chat: Discord mailing_list: Google Group github: GitHub + mastodon: Mastodon theme_switcher: title: Theme Switcher light: Light diff --git a/src/_data/sites/es.yml b/src/_data/sites/es.yml index 5f3e99087..954e7566a 100644 --- a/src/_data/sites/es.yml +++ b/src/_data/sites/es.yml @@ -82,6 +82,7 @@ footer: chat: Discord mailing_list: Google Group github: GitHub + mastodon: Mastodon theme_switcher: title: Cambiar temas light: Claro diff --git a/src/_data/sites/fr.yml b/src/_data/sites/fr.yml index 276eaf452..44f343c9d 100644 --- a/src/_data/sites/fr.yml +++ b/src/_data/sites/fr.yml @@ -83,6 +83,7 @@ footer: chat: Discord mailing_list: Google Group github: GitHub + mastodon: Mastodon theme_switcher: title: Thèmes light: Light diff --git a/src/_data/sites/hi.yml b/src/_data/sites/hi.yml index 4bd328480..08a2a4034 100644 --- a/src/_data/sites/hi.yml +++ b/src/_data/sites/hi.yml @@ -81,6 +81,7 @@ footer: chat: Discord mailing_list: Google Group github: GitHub + mastodon: Mastodon theme_switcher: title: Theme Switcher light: Light diff --git a/src/_data/sites/ja.yml b/src/_data/sites/ja.yml index 7f8d7c30a..cb8cadfed 100644 --- a/src/_data/sites/ja.yml +++ b/src/_data/sites/ja.yml @@ -82,6 +82,7 @@ footer: chat: Discord mailing_list: Google グループ github: GitHub + mastodon: Mastodon theme_switcher: title: 配色モード切り替え light: 通常 diff --git a/src/_data/sites/pt-br.yml b/src/_data/sites/pt-br.yml index f39856937..c43ef601c 100644 --- a/src/_data/sites/pt-br.yml +++ b/src/_data/sites/pt-br.yml @@ -82,6 +82,7 @@ footer: chat: Discord mailing_list: Google Group github: GitHub + mastodon: Mastodon theme_switcher: title: Trocar tema light: Claro diff --git a/src/_data/sites/zh-hans.yml b/src/_data/sites/zh-hans.yml index e12ab6546..6e9a6bcaa 100644 --- a/src/_data/sites/zh-hans.yml +++ b/src/_data/sites/zh-hans.yml @@ -81,6 +81,7 @@ footer: chat: Discord mailing_list: Google Group github: GitHub + mastodon: Mastodon theme_switcher: title: 主题切换 light: 浅色 diff --git a/src/_includes/components/social-icons.html b/src/_includes/components/social-icons.html index 6a0940a4e..2fb811a75 100644 --- a/src/_includes/components/social-icons.html +++ b/src/_includes/components/social-icons.html @@ -3,31 +3,45 @@ - + \ No newline at end of file diff --git a/src/playground/components/SocialIcons.js b/src/playground/components/SocialIcons.js index b6e54d7b9..44aa49e75 100644 --- a/src/playground/components/SocialIcons.js +++ b/src/playground/components/SocialIcons.js @@ -40,7 +40,18 @@ export default function SocialIcons() { + + +
  • + + + + +
    • From 22d0e65681fb86750d698e56ae78c87a1d75b50e Mon Sep 17 00:00:00 2001 From: Amaresh S M Date: Sat, 10 Dec 2022 15:10:31 +0530 Subject: [PATCH 2/6] Update social-icons.html --- src/_includes/components/social-icons.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_includes/components/social-icons.html b/src/_includes/components/social-icons.html index 2fb811a75..3dd26a17b 100644 --- a/src/_includes/components/social-icons.html +++ b/src/_includes/components/social-icons.html @@ -65,4 +65,4 @@ - \ No newline at end of file + From d612b8a15ee18f8fbb6cff89c34d28eac05827b8 Mon Sep 17 00:00:00 2001 From: Amaresh S M Date: Sat, 10 Dec 2022 15:16:53 +0530 Subject: [PATCH 3/6] lint file --- src/_includes/components/social-icons.html | 23 +++++++--------------- src/playground/components/SocialIcons.js | 9 +++------ 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/src/_includes/components/social-icons.html b/src/_includes/components/social-icons.html index 3dd26a17b..2b5397a15 100644 --- a/src/_includes/components/social-icons.html +++ b/src/_includes/components/social-icons.html @@ -3,8 +3,7 @@ diff --git a/src/playground/components/SocialIcons.js b/src/playground/components/SocialIcons.js index 44aa49e75..49c8388de 100644 --- a/src/playground/components/SocialIcons.js +++ b/src/playground/components/SocialIcons.js @@ -45,12 +45,9 @@ export default function SocialIcons() {
  • - - - + + +
    • From d1fa7662fa1a1138e0883efde8ebce77dba5d170 Mon Sep 17 00:00:00 2001 From: Amaresh S M Date: Sat, 10 Dec 2022 16:11:21 +0530 Subject: [PATCH 4/6] fix indendation --- src/_includes/components/social-icons.html | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/_includes/components/social-icons.html b/src/_includes/components/social-icons.html index 2b5397a15..3922c978a 100644 --- a/src/_includes/components/social-icons.html +++ b/src/_includes/components/social-icons.html @@ -4,27 +4,21 @@
  • - +
  • - +
  • - +
    • @@ -32,12 +26,8 @@ - - + + @@ -45,6 +35,7 @@ +
  • From f637fca5687c5c3be71fb0b6b3b29c7a345e6f46 Mon Sep 17 00:00:00 2001 From: Amaresh S M Date: Sat, 10 Dec 2022 22:47:28 +0530 Subject: [PATCH 5/6] add rel attribute --- src/_includes/components/social-icons.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/_includes/components/social-icons.html b/src/_includes/components/social-icons.html index 3922c978a..b23f2ea0c 100644 --- a/src/_includes/components/social-icons.html +++ b/src/_includes/components/social-icons.html @@ -2,28 +2,28 @@