Skip to content
This repository has been archived by the owner on Aug 27, 2024. It is now read-only.

Commit

Permalink
Merge pull request #6 from yanranxiaoxi/main
Browse files Browse the repository at this point in the history 
feat: synchronize multiple modifications
  • Loading branch information
@xiamuguizhi
xiamuguizhi authored Oct 10, 2022
2 parents 3902b89 + dc9219c commit 2a6e04b
Show file tree
Hide file tree
Showing 31 changed files with 2,068 additions and 1,949 deletions.
166 changes: 83 additions & 83 deletions 404.php
View file
Original file line number Diff line number Diff line change
@@ -1,89 +1,89 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Page Not Found</title>
<style>
* {
margin: 0;
padding: 0;
}
body {
display: flex;
flex-direction: column;
height: 100vh;
text-align: center;
}
.box {
flex: 1;
display: flex;
justify-content: center;
flex-direction: column;
}
.number {
font-size: 80px;
color: #666;
font-weight: bold;
}
.text {
font-size: 14px;
margin: 24px;
color: #333;
}
.btn-container {
display: flex;
justify-content: center;
}
.btn {
padding: 8px 24px;
display: inline-block;
text-decoration: none;
background: #fff;
border: 2px solid #efefef;
color: #333;
margin: 24px;
border-radius: 20px;
cursor: pointer;
display: flex;
align-items: center;
}
.footer {
padding: 16px;
border-top: 1px solid #efefef;
color: #777;
font-weight: lighter;
}
.footer a {
text-decoration: none;
font-weight: bold;
color: #000;
}
</style>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>Page Not Found</title>
<style>
* {
margin: 0;
padding: 0;
}
body {
display: flex;
flex-direction: column;
height: 100vh;
text-align: center;
}
.box {
flex: 1;
display: flex;
justify-content: center;
flex-direction: column;
}
.number {
font-size: 80px;
color: #666;
font-weight: bold;
}
.text {
font-size: 14px;
margin: 24px;
color: #333;
}
.btn-container {
display: flex;
justify-content: center;
}
.btn {
padding: 8px 24px;
display: inline-block;
text-decoration: none;
background: #fff;
border: 2px solid #efefef;
color: #333;
margin: 24px;
border-radius: 20px;
cursor: pointer;
display: flex;
align-items: center;
}
.footer {
padding: 16px;
border-top: 1px solid #efefef;
color: #777;
font-weight: lighter;
}
.footer a {
text-decoration: none;
font-weight: bold;
color: #000;
}
</style>
</head>
<body>
<div class="box">
<div class="number">4 0 4</div>
<div class="text">
Page not found
</div>
<div class="btn-container">
<a class="btn" id="back">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16" style="margin-right: 8px;">
<path fill="none" d="M0 0h24v24H0z"/>
<path d="M5.828 7l2.536 2.536L6.95 10.95 2 6l4.95-4.95 1.414 1.414L5.828 5H13a8 8 0 1 1 0 16H4v-2h9a6 6 0 1 0 0-12H5.828z"/>
</svg>
Back
</a>
</div>
</div>
<footer class="footer">
Powered by <a href="http://typecho.org/" target="_blank">Typecho</a>
</footer>
<script>
var back = document.getElementById('back')
back.onclick = function() { console.log('run...'); history.back() }
</script>
<div class="box">
<div class="number">4 0 4</div>
<div class="text">
Page not found
</div>
<div class="btn-container">
<a class="btn" id="back">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16" style="margin-right: 8px;">
<path fill="none" d="M0 0h24v24H0z" />
<path d="M5.828 7l2.536 2.536L6.95 10.95 2 6l4.95-4.95 1.414 1.414L5.828 5H13a8 8 0 1 1 0 16H4v-2h9a6 6 0 1 0 0-12H5.828z" />
</svg>
Back
</a>
</div>
</div>
<footer class="footer">
Powered by <a href="https://typecho.org/" target="_blank">Typecho</a>
</footer>
<script>
var back = document.getElementById('back')
back.onclick = function() { console.log('run...'); history.back() }
</script>
</body>
</html>
</html>
118 changes: 57 additions & 61 deletions archive.php
View file
Original file line number Diff line number Diff line change
@@ -1,79 +1,75 @@
<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
<?php $this->need('header.php'); ?>

<div class="post-list-container">
<h2 class="title gt-c-content-color-first" style="margin-top: 20px; "><?php $this->archiveTitle(array(
'category' => _t('分类 %s 下的文章'),
'search' => _t('包含关键字 %s 的文章'),
'tag' => _t('标签 %s 下的文章'),
'author' => _t('%s 发布的文章')
), '', ''); ?></h2>
<div class="post-inner">

<?php if ($this->have()): ?>
<?php while ($this->next()): ?>
<div class="post gt-bg-theme-color-second">
<div class="post-left">
<div>
<a href="<?php $this->permalink(); ?>">
<span class="post-title gt-c-content-color-first"><?php $this->title(); ?></span>
</a>
</div>
<a href="<?php $this->permalink(); ?>">
<div class="gt-post-content post-abstract gt-c-content-color-second">
<p><?php $this->excerpt('200', '...'); ?></p>
</div>
</a>
<div class="post-info">
<time class="post-time gt-c-content-color-first">
发布于 · <?php $this->date(); ?> ·
</time>


<div class="post-list-container">
<h2 class="title gt-c-content-color-first" style="margin-top: 20px; "><?php $this->archiveTitle(array(
'category' => _t('分类 %s 下的文章'),
'search' => _t('包含关键字 %s 的文章'),
'tag' => _t('标签 %s 下的文章'),
'author' => _t('%s 发布的文章')
), '', ''); ?></h2>
<div class="post-inner">

<?php if ($this->have()): ?>
<?php while($this->next()): ?>
<div class="post gt-bg-theme-color-second">
<div class="post-left">
<div>

<a href="<?php $this->permalink() ?>">
<span class="post-title gt-c-content-color-first"><?php $this->title() ?></span>
</a>
</div>
<div class="gt-post-content post-abstract gt-c-content-color-second">
<p><?php $this->excerpt('200','...'); ?></p>

</div>
<div class="post-info">
<time class="post-time gt-c-content-color-first">
发布于 · <?php $this->date(); ?> ·
</time>

<?php if( count($this->tags) == 0 ): ?>
<?php _e('# '); ?>
<?php $this->category(' # ', true, 'none'); ?>
<?php else: ?>
<?php if (count($this->tags) > 0): ?>
<?php _e('# '); ?>
<?php $this->tags(' # ', true, 'none'); ?>
<?php endif; ?>

<!-- printTag($this); php 自定义标签样式-->

</div>
</div>

<?php if(yotu($this)==1): ?>
<a href="<?php $this->permalink() ?>" class="post-feature-image"
style="background-image: url('<?php showThumbnail($this); ?>')">
</a>
<?php else: ?>
<!-- 不存在 -->
<?php endif;?>

</div>
<?php endwhile; ?>
<?php else: ?>
<div id="gridea-search-result" data-update="1596183679944">
<div class="no-result" style="font-size: 20px; margin-top: 50px;">
<i class="fa fa-exclamation-triangle"></i>&nbsp;&nbsp;未搜索到相关文章，请更换关键词
</div>
</div>
<?php endif; ?>

</div>
<!-- printTag($this); PHP 自定义标签样式 -->

</div>
</div>

<?php if (yotu($this) == 1): ?>
<a href="<?php $this->permalink(); ?>" class="post-feature-image"
style="background-image: url('<?php showThumbnail($this); ?>')">
</a>
<?php else: ?>
<!-- 不存在 -->
<?php endif; ?>

</div>
<?php endwhile; ?>
<?php else: ?>
<div id="gridea-search-result" data-update="1596183679944">
<div class="no-result" style="font-size: 20px; margin-top: 50px;">
<i class="fa fa-exclamation-triangle"></i>&nbsp;&nbsp;未搜索到相关文章，请更换关键词
</div>
</div>
<?php endif; ?>

</div>
</div>

<div class="pagination-container">

<?php $this->pageLink('上一页'); ?>
当前页码：<?php if($this->_currentPage>1) echo $this->_currentPage; else echo 1;?>
总页码：<?php echo ceil($this->getTotal() / $this->parameter->pageSize); ?>
<?php $this->pageLink('下一页','next'); ?>

<?php $this->pageLink('上一页'); ?>
当前页码：<?php if ($this->_currentPage > 1) echo $this->_currentPage; else echo 1; ?>
·
总页码：<?php echo ceil($this->getTotal() / $this->parameter->pageSize); ?>
<?php $this->pageLink('下一页', 'next'); ?>

</div>

<?php $this->need('footer.php'); ?>
<?php $this->need('footer.php'); ?>
27 changes: 0 additions & 27 deletions baidu.php
View file

This file was deleted.

Loading

0 comments on commit 2a6e04b

Please sign in to comment.