diff --git a/amp.css b/amp.css
index 400d8de19..71ede96d3 100644
--- a/amp.css
+++ b/amp.css
@@ -1,6 +1,8 @@
@charset "UTF-8";
:root {
--cocoon-twitter-color: #000000;
+ --cocoon-misskey-color: #b4e900;
+ --cocoon-bluesky-color: #0085ff;
--cocoon-facebook-color: #3b5998;
--cocoon-hatebu-color: #2c6ebd;
--cocoon-google-plus-color: #dd4b39;
@@ -1384,6 +1386,14 @@ img.emoji {
--cocoon-sns-color: var(--cocoon-twitter-color);
}
+[class*=bc-brand-color] .bluesky-button {
+ --cocoon-sns-color: var(--cocoon-bluesky-color);
+}
+
+[class*=bc-brand-color] .misskey-button {
+ --cocoon-sns-color: var(--cocoon-misskey-color);
+}
+
[class*=bc-brand-color] .facebook-button {
--cocoon-sns-color: var(--cocoon-facebook-color);
}
diff --git a/css/admin.css b/css/admin.css
index a8b1ae814..88b78ca09 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -9,6 +9,8 @@ body.wp-admin {
:root {
--cocoon-twitter-color: #000000;
+ --cocoon-misskey-color: #b4e900;
+ --cocoon-bluesky-color: #0085ff;
--cocoon-facebook-color: #3b5998;
--cocoon-hatebu-color: #2c6ebd;
--cocoon-google-plus-color: #dd4b39;
@@ -1830,6 +1832,12 @@ body.wp-admin {
.admin-settings .demo [class*=bc-brand-color] .x-corp-button {
--cocoon-sns-color: var(--cocoon-twitter-color);
}
+.admin-settings .demo [class*=bc-brand-color] .bluesky-button {
+ --cocoon-sns-color: var(--cocoon-bluesky-color);
+}
+.admin-settings .demo [class*=bc-brand-color] .misskey-button {
+ --cocoon-sns-color: var(--cocoon-misskey-color);
+}
.admin-settings .demo [class*=bc-brand-color] .facebook-button {
--cocoon-sns-color: var(--cocoon-facebook-color);
}
@@ -10071,6 +10079,12 @@ body.wp-admin {
.admin-settings .demo [class*=bc-brand-color] .x-corp-button {
--cocoon-sns-color: var(--cocoon-twitter-color);
}
+.admin-settings .demo [class*=bc-brand-color] .bluesky-button {
+ --cocoon-sns-color: var(--cocoon-bluesky-color);
+}
+.admin-settings .demo [class*=bc-brand-color] .misskey-button {
+ --cocoon-sns-color: var(--cocoon-misskey-color);
+}
.admin-settings .demo [class*=bc-brand-color] .facebook-button {
--cocoon-sns-color: var(--cocoon-facebook-color);
}
diff --git a/css/gutenberg-editor.css b/css/gutenberg-editor.css
index f1d0470b1..11bcd2c7b 100644
--- a/css/gutenberg-editor.css
+++ b/css/gutenberg-editor.css
@@ -1,6 +1,8 @@
@charset "UTF-8";
:root {
--cocoon-twitter-color: #000000;
+ --cocoon-misskey-color: #b4e900;
+ --cocoon-bluesky-color: #0085ff;
--cocoon-facebook-color: #3b5998;
--cocoon-hatebu-color: #2c6ebd;
--cocoon-google-plus-color: #dd4b39;
diff --git a/editor-style.css b/editor-style.css
index 07ba4d780..53b1c0844 100644
--- a/editor-style.css
+++ b/editor-style.css
@@ -1,6 +1,8 @@
@charset "UTF-8";
:root {
--cocoon-twitter-color: #000000;
+ --cocoon-misskey-color: #b4e900;
+ --cocoon-bluesky-color: #0085ff;
--cocoon-facebook-color: #3b5998;
--cocoon-hatebu-color: #2c6ebd;
--cocoon-google-plus-color: #dd4b39;
diff --git a/lib/_defins.php b/lib/_defins.php
index 3e0673aef..126d49137 100644
--- a/lib/_defins.php
+++ b/lib/_defins.php
@@ -293,7 +293,7 @@
//Font Awesome5アップデート
define('FONT_AWESOME_5_UPDATE_URL', get_template_directory_uri().'/css/fontawesome5.css');
//IcoMoonフォント
-define('FONT_ICOMOON_UPDATED_VERSION_URL_QUERY', '?v=2.6.8');
+define('FONT_ICOMOON_UPDATED_VERSION_URL_QUERY', '?v=2.7.0.1');
define('FONT_ICOMOON_URL', get_template_directory_uri() . '/webfonts/icomoon/style.css'.FONT_ICOMOON_UPDATED_VERSION_URL_QUERY);
define('FONT_ICOMOON_WOFF_URL', get_template_directory_uri() . '/webfonts/icomoon/fonts/icomoon.woff'.FONT_ICOMOON_UPDATED_VERSION_URL_QUERY);
define('FONT_ICOMOON_TTF_URL', get_template_directory_uri() . '/webfonts/icomoon/fonts/icomoon.ttf'.FONT_ICOMOON_UPDATED_VERSION_URL_QUERY);
diff --git a/lib/page-settings/sns-follow-forms.php b/lib/page-settings/sns-follow-forms.php
index db5135b8f..2ce9d8f0e 100644
--- a/lib/page-settings/sns-follow-forms.php
+++ b/lib/page-settings/sns-follow-forms.php
@@ -70,6 +70,8 @@
+
+
diff --git a/lib/sns-follow.php b/lib/sns-follow.php
index ac0e8364a..af63503f6 100644
--- a/lib/sns-follow.php
+++ b/lib/sns-follow.php
@@ -133,6 +133,8 @@ function fetch_push7_info(){
function user_contactmethods_custom($prof_items){
//項目の追加
$prof_items['twitter_url'] = __( 'X(旧Twitter) URL', THEME_NAME );
+ $prof_items['bluesky_url'] = __( 'Bluesky URL', THEME_NAME );
+ $prof_items['misskey_url'] = __( 'Misskfy URL', THEME_NAME );
$prof_items['facebook_url'] = __( 'Facebook URL', THEME_NAME );
//$prof_items['google_plus_url'] = __( 'Google+ URL', THEME_NAME );
$prof_items['hatebu_url'] = __( 'はてブ URL', THEME_NAME );
@@ -244,6 +246,22 @@ function get_the_author_twitter_id($url = null){
}
endif;
+//プロフィール画面で設定したBluesky URLの取得
+if ( !function_exists( 'get_the_author_bluesky_url' ) ):
+function get_the_author_bluesky_url($id = null){
+ $user_id = $id ? $id : get_the_posts_author_id();
+ return esc_html(get_the_author_meta('bluesky_url', $user_id));
+}
+endif;
+
+//プロフィール画面で設定したMisskey URLの取得
+if ( !function_exists( 'get_the_author_misskey_url' ) ):
+function get_the_author_misskey_url($id = null){
+ $user_id = $id ? $id : get_the_posts_author_id();
+ return esc_html(get_the_author_meta('misskey_url', $user_id));
+}
+endif;
+
//プロフィール画面で設定したFacebook URLの取得
if ( !function_exists( 'get_the_author_facebook_url' ) ):
function get_the_author_facebook_url($id = null){
@@ -409,6 +427,8 @@ function get_the_author_codepen_url($id = null){
function is_author_follow_buttons_exits(){
return get_the_author_website_url()
|| get_the_author_twitter_url()
+ || get_the_author_bluesky_url()
+ || get_the_author_misskey_url()
|| get_the_author_facebook_url()
//|| get_the_author_google_plus_url()
|| get_the_author_hatebu_url()
diff --git a/scss/__root.scss b/scss/__root.scss
index b3db3c317..e54805286 100644
--- a/scss/__root.scss
+++ b/scss/__root.scss
@@ -1,6 +1,8 @@
:root{
//ブランドカラーまとめ
--cocoon-twitter-color: #000000;
+ --cocoon-misskey-color: #b4e900;
+ --cocoon-bluesky-color: #0085ff;
--cocoon-facebook-color: #3b5998;
--cocoon-hatebu-color: #2c6ebd;
--cocoon-google-plus-color: #dd4b39;
diff --git a/scss/_sns-share.scss b/scss/_sns-share.scss
index 0537fdd1b..bd351bb8c 100644
--- a/scss/_sns-share.scss
+++ b/scss/_sns-share.scss
@@ -47,6 +47,14 @@
--cocoon-sns-color: var(--cocoon-twitter-color);
}
+[class*="bc-brand-color"] .bluesky-button {
+ --cocoon-sns-color: var(--cocoon-bluesky-color);
+}
+
+[class*="bc-brand-color"] .misskey-button {
+ --cocoon-sns-color: var(--cocoon-misskey-color);
+}
+
[class*="bc-brand-color"] .facebook-button {
--cocoon-sns-color: var(--cocoon-facebook-color);
}
diff --git a/skins/skin-grayish-topfull/functions.php b/skins/skin-grayish-topfull/functions.php
index d60ea6be4..28c35e464 100644
--- a/skins/skin-grayish-topfull/functions.php
+++ b/skins/skin-grayish-topfull/functions.php
@@ -779,6 +779,14 @@ function skin_grayish_topmv_dotoverlay_customize($wp_customize)
'label' => 'X(旧Twitter)フォローボタンを表示',
'setting_name' => 'twitter',
),
+ array(
+ 'label' => 'Bluesky フォローボタンを表示',
+ 'setting_name' => 'bluesky',
+ ),
+ array(
+ 'label' => 'Misskey フォローボタンを表示',
+ 'setting_name' => 'misskey',
+ ),
array(
'label' => 'Facebook フォローボタンを表示',
'setting_name' => 'facebook',
@@ -1068,6 +1076,8 @@ function skin_grayish_gnavi_snsbtn()
global $skin_gnavi_snsbtn_On;
$skin_gnavi_snsbtn_options = array(
'gnavi_sns_twitter' => get_theme_mod('snsbtn_select_twitter', 'snsbtn_select_Off'),
+ 'gnavi_sns_bluesky' => get_theme_mod('snsbtn_select_bluesky', 'snsbtn_select_Off'),
+ 'gnavi_sns_misskey' => get_theme_mod('snsbtn_select_misskey', 'snsbtn_select_Off'),
'gnavi_sns_facebook' => get_theme_mod('snsbtn_select_facebook', 'snsbtn_select_Off'),
'gnavi_sns_hatena' => get_theme_mod('snsbtn_select_hatena', 'snsbtn_select_Off'),
'gnavi_sns_instagram' => get_theme_mod('snsbtn_select_instagram', 'snsbtn_select_Off'),
diff --git a/skins/skin-grayish-topfull/tmp-grayish/cstm-sns-follow-buttons.php b/skins/skin-grayish-topfull/tmp-grayish/cstm-sns-follow-buttons.php
index 76989793d..3ca729df8 100644
--- a/skins/skin-grayish-topfull/tmp-grayish/cstm-sns-follow-buttons.php
+++ b/skins/skin-grayish-topfull/tmp-grayish/cstm-sns-follow-buttons.php
@@ -24,6 +24,8 @@
// プロフィール欄に入力 かつ カスタマイザーONの組み合わせが1つもなければリストは出力しない
$skin_gnavi_nooutput = (($skin_gnavi_snsbtn_options['gnavi_sns_twitter'] === 'snsbtn_select_On') && get_the_author_twitter_url($user_id)) ||
+ (($skin_gnavi_snsbtn_options['gnavi_sns_bluesky'] === 'snsbtn_select_On') && get_the_author_bluesky_url($user_id)) ||
+ (($skin_gnavi_snsbtn_options['gnavi_sns_misskey'] === 'snsbtn_select_On') && get_the_author_misskey_url($user_id)) ||
(($skin_gnavi_snsbtn_options['gnavi_sns_facebook'] === 'snsbtn_select_On') && get_the_author_facebook_url($user_id)) ||
(($skin_gnavi_snsbtn_options['gnavi_sns_hatena'] === 'snsbtn_select_On') && get_the_author_hatebu_url($user_id)) ||
(($skin_gnavi_snsbtn_options['gnavi_sns_instagram'] === 'snsbtn_select_On') && get_the_author_instagram_url($user_id)) ||
@@ -47,7 +49,7 @@