Skip to content

Commit

Permalink
Merge pull request #394 from mirai-mamori/preview
Browse files Browse the repository at this point in the history
燕「ツバメ」 Update SP2
  • Loading branch information
mirai-mamori authored Dec 6, 2021
2 parents e78e7d9 + a8eb488 commit ca68ea9
Show file tree
Hide file tree
Showing 16 changed files with 7,933 additions and 8,113 deletions.
7 changes: 0 additions & 7 deletions 404.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@
<meta charset="<?php bloginfo('charset'); ?>">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="<?php echo iro_opt('favicon_link', ''); ?>" />
<title itemprop="name"><?php global $page, $paged;
wp_title('-', true, 'right');
bloginfo('name');
$site_description = get_bloginfo('description', 'display');
if ($site_description && (is_home() || is_front_page())) echo " - $site_description";
if ($paged >= 2 || $page >= 2) echo ' - ' . sprintf(__('page %s'), max($paged, $page));/*第 %s 页*/ ?>
</title>
<link type="text/css" media="all" href="https://cdn.jsdelivr.net/gh/Fuukei/Public_Repository@latest/static/css/basic/404_lib.css" rel="stylesheet" />
<?php wp_head(); ?>
<?php
Expand Down
4 changes: 2 additions & 2 deletions footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
<?php wp_nav_menu( array( 'depth' => 2, 'theme_location' => 'primary', 'container' => false ) ); ?>
</div><!-- m-nav-center end -->
<a class="cd-top faa-float animated "></a>
<button id="moblieGoTop" title="Go to top"><i class="fa fa-chevron-up" aria-hidden="true"></i></button>
<button id="changskin" style="bottom: 15px;"><i class="iconfont icon-gear inline-block rotating"></i></button>
<button id="moblieGoTop" title="<?=__('Go to top','sakurairo');?>"><i class="fa fa-chevron-up" aria-hidden="true"></i></button>
<button id="changskin"><i class="iconfont icon-gear inline-block rotating"></i></button>
<!-- search start -->
<form class="js-search search-form search-form--modal" method="get" action="<?php echo home_url(); ?>" role="search">
<div class="search-form__inner">
Expand Down
5 changes: 5 additions & 0 deletions functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ function akina_setup()
'default-color' => 'ffffff',
'default-image' => '',
)));
/**
* 废弃过时的wp_title
* @seealso https://make.wordpress.org/core/2015/10/20/document-title-in-4-4/
*/
add_theme_support( 'title-tag' );

add_filter('pre_option_link_manager_enabled', '__return_true');

Expand Down
7 changes: 0 additions & 7 deletions header.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@
<meta charset="<?php bloginfo('charset'); ?>">
<!--<meta name="viewport" content="width=device-width, initial-scale=1">-->
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport">
<title itemprop="name"><?php global $page, $paged;
wp_title('-', true, 'right');
bloginfo('name');
$site_description = get_bloginfo('description', 'display');
if ($site_description && (is_home() || is_front_page())) echo " - $site_description";
if ($paged >= 2 || $page >= 2) echo ' - ' . sprintf(__('page %s ', 'sakurairo'), max($paged, $page));/*第 %s 页*/ ?>
</title>
<?php
if (iro_opt('iro_meta') == true) {
$keywords = '';
Expand Down
8 changes: 4 additions & 4 deletions inc/categories-images.php
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,11 @@ function z_quick_edit_custom_box($column_name, $screen, $name) {
*/
function z_taxonomy_columns( $columns ) {
$new_columns = array();
if(isset($columns['cb']))$new_columns['cb'] = $columns['cb'];
if(isset($columns)){
$new_columns['cb'] = $columns['cb'];
unset( $columns['cb'] );
}
$new_columns['thumb'] = __('image', 'sakurairo')/*图像*/;

unset( $columns['cb'] );

return array_merge( $new_columns, $columns );
}

Expand Down
Loading

0 comments on commit ca68ea9

Please sign in to comment.