Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #3088 【baserCMS4】Twitter→Xに伴うアイコン、文言変更 #3186

Merged
merged 1 commit into from
Feb 29, 2024
Merged

fix #3088 【baserCMS4】Twitter→Xに伴うアイコン、文言変更 #3186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions app/webroot/theme/admin-third/Elements/admin/footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
</div>

<ul class="bca-footer__sns">
<li class="bca-footer__sns__item"><a href="http://www.facebook.com/basercms" target="_blank"
<li class="bca-footer__sns__item"><a href="https://www.facebook.com/basercms" target="_blank"
class="bca-footer__sns__link bca-footer__sns__link--facebook">Facebook</a>
</li>
<li class="bca-footer__sns__item"><a href="http://twitter.com/basercms" target="_blank"
class="bca-footer__sns__link bca-footer__sns__link--twitter">Twitter</a>
<li class="bca-footer__sns__item"><a href="https://twitter.com/basercms" target="_blank"
class="bca-footer__sns__link bca-footer__sns__link--twitter">X</a>
</li>
</ul>

Expand Down
4 changes: 2 additions & 2 deletions app/webroot/theme/admin-third/Installations/admin/step5.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ class="outside-link"><?php echo __d('baser', 'baserCMS公式サイトで情報
class="outside-link"><?php echo __d('baser', 'baserCMS公式ガイドで学ぶ') ?></a></li>
<li><a href="https://forum.basercms.net" title="baserCMSユーザーズフォーラム" target="_blank"
class="outside-link"><?php echo __d('baser', 'フォーラムにインストールの不具合を報告する') ?></a></li>
<li><a href="https://twitter.com/#!/basercms" title="baserCMS公式Twitter" target="_blank"
class="outside-link"><?php echo __d('baser', '公式Twitterをフォローする') ?></a></li>
<li><a href="https://twitter.com/basercms" title="baserCMS公式X" target="_blank"
class="outside-link"><?php echo __d('baser', '公式Xをフォローする') ?></a></li>
<li><a href="https://facebook.com/basercms" title="baserCMS公式Facebookページ" target="_blank"
class="outside-link"><?php echo __d('baser', 'Facebookでいいね！する') ?></a></li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion app/webroot/theme/admin-third/SiteConfigs/admin/ajax_credit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<?php echo h($contributor->alphabet) ?>
<?php endif ?>
<?php if (!empty($contributor->twitter)): ?>
(<?php $this->BcBaser->link($contributor->twitter, 'http://twitter.com/' . $contributor->twitter, ['target' => '_blank', 'escape' => true]) ?>)
(<?php $this->BcBaser->link($contributor->twitter, 'https://twitter.com/' . $contributor->twitter, ['target' => '_blank', 'escape' => true]) ?>)
<?php endif ?>
</li>
<?php if ($i % 6 == 0 || $this->BcArray->last($credits->{$type}, $key)): ?>
Expand Down
2 changes: 1 addition & 1 deletion app/webroot/theme/admin-third/__assets/css/components/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
}
&--twitter {
@include bca-icon(twitter);
background-color: #54ABED;
background-color: #000;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/webroot/theme/admin-third/__assets/css/vender/Font-Awesome/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@ $fa-var-tumblr: \f173;
$fa-var-tumblr-square: \f174;
$fa-var-tv: \f26c;
$fa-var-twitch: \f1e8;
$fa-var-twitter: \f099;
$fa-var-twitter: \1d54f;
$fa-var-twitter-square: \f081;
$fa-var-typo3: \f42b;
$fa-var-uber: \f402;
Expand Down
107 changes: 37 additions & 70 deletions app/webroot/theme/admin-third/css/admin/style.css
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading