Skip to content
This repository has been archived by the owner on Jul 17, 2022. It is now read-only.

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@gogobody
gogobody committed Nov 30, 2020
2 parents 1145ff8 + 38ff49c commit e7b01fb
Show file tree
Hide file tree
Showing 106 changed files with 3,644 additions and 1,877 deletions.
9 changes: 4 additions & 5 deletions 404.php
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
<?php $this->need('includes/header.php'); ?>
<div class="container-lg animate__animated animate__fadeIn" id="pjax-container">
<div class="row">
<?php $this->need('includes/nav.php');?>
<div class="col-xl-7 col-md-6 col-12">
<?php $this->need('includes/body-layout.php');?>
<div class="hbox hbox-auto-xs hbox-auto-sm index">
<div class="col center-part">
<div class="error-page">
<h2 class="post-title">404 - <?php _e('页面没找到'); ?></h2>
<p><?php _e('你想查看的页面已被转移或删除了, 要不要搜索看看: '); ?></p>
Expand All @@ -15,5 +14,5 @@
</div>
<?php $this->need('includes/right.php');?>
</div>
</div>
<?php $this->need('includes/body-layout-end.php');?>
<?php $this->need('includes/footer.php'); ?>
9 changes: 7 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
## onecircle 一个圈子，基于typecho

## 名字就叫一个圈子。
## version：2.8
## version：3.0
## 平台：typecho

### 想弄一个类社交圈子，开发了一部分，剩下慢慢折腾

## 主题文档
更多请查看[OneCircle 主题说明](https://www.yuque.com/docs/share/05f40cac-980f-4e53-8b92-ed9728b8dc50?#%E3%80%8AOneCircle%20%E4%B8%BB%E9%A2%98%E8%AF%B4%E6%98%8E%E3%80%8B)

(￢_￢)
目前特色有：
1. 前端仿推特
Expand All @@ -15,6 +18,7 @@
5. 支持用户注册默认更改权限为贡献者，并自动通过审核，这样新注册的用户也能自己发推了
6. 支持给每个新注册用户添加个人签名和tag
7. 支持免费的sm 图床
8. 支持博客页

## changeLog
v1.6 支持 pjax，以及前台登录发布文章，加入progress动画
Expand All @@ -30,6 +34,7 @@ v2.5 添加用户性别和个人情感状态
v2.6 修复评论bug，修改link 显示
v2.7 图床插件支持上传图片到本地，添加首页评论显示
v2.8 添加 lazyload ，将默认的gallery 原始的background显示方式迁移至src显示
v3.0 支持博客页
## 安装
下载 release 包：
内含：
Expand Down Expand Up @@ -144,4 +149,4 @@ links
### 感谢以下作者的辛苦付出
- compress https://javascript-minifier.com/
- css compress https://www.runoob.com/csspack
- 部分代码来自handsome、 [landstar](https://dyedd.cn)、油油的twitter等主题，感谢作者的辛苦付出
- 部分代码来自handsome、 [landstar](https://dyedd.cn)、油油的twitter、[joe博客](http://ae.js.cn/about.html) 等主题，感谢作者的辛苦付出
19 changes: 8 additions & 11 deletions archive.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,16 @@
?>
<?php $this->need('includes/header.php'); ?>

<div class="container-lg animate__animated animate__fadeIn" id="pjax-container">
<div class="row">
<?php $this->need('includes/nav.php'); ?>
<div class="col-xl-10 col-md-10 col-12 achieve-container">
<?php $this->need('includes/body-layout.php');?>
<div class="hbox hbox-auto-xs hbox-auto-sm archive">
<div class="archive-container">
<?php if ($this->is('author')): ?>
<?php $this->need('components/archive/archive-author.php') ?>
<?php elseif ($this->is('category')): ?>
<?php $this->need('components/archive/archive-category.php') ?>
<?php endif; ?>
<div class="achieve-content">
<div class="col-12 col-md-8 outer">

<div class="archive-content tabindex-<?_e($tabIndex);?>">
<div class="outer">
<div class="react-tabs" data-tabs="true">
<div class="line"></div>
<ul class="react-tabs__tab-list">
Expand Down Expand Up @@ -148,14 +146,13 @@ class="sc-AxjAm sc-AxirZ eGdPrb"><img
</div>
</div>

<?php if ($tabIndex==0 || $tabIndex == 3){$this->need('includes/pagination.php');} ?>
<?php if ($tabIndex==0 || $tabIndex == 3){$this->need('includes/post-pagination.php');} ?>

</div>
<?php $this->need('includes/achieve-right.php'); ?>
<?php $this->need('includes/archive-right.php'); ?>
</div>

</div>
</div>
</div>

<?php $this->need('includes/body-layout-end.php');?>
<?php $this->need('includes/footer.php'); ?>
209 changes: 12 additions & 197 deletions archives.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
if (!defined('__TYPECHO_ROOT_DIR__')) exit;
$this->need('includes/header.php');
?>
<div class="container-lg animate__animated animate__fadeIn" id="pjax-container">
<div class="row">
<?php $this->need('includes/nav.php'); ?>

<div class="col-xl-7 col-md-7 col-12 page" id="pjax-container">
<?php $this->need('includes/body-layout.php');?>
<div class="hbox hbox-auto-xs hbox-auto-sm archive-page index">
<div class="col center-part">
<div class="page">
<article class="post" id="post-<?php $this->cid(); ?>">
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
Expand All @@ -24,198 +23,11 @@
<?php endif; ?>
</ol>
</nav>
<!-- <h1 class="article-title"><a href="--><?php //$this->permalink(); ?><!--">--><?php //$this->title(); ?><!--</a></h1>-->
<style>
html {
overflow-x: hidden;
overflow-y: auto
}

#archives-tags, #archives-categories {
margin: 30px 0;
position: relative
}

.theme-dark #archives-tags > div, .theme-dark #archives-categories > div {
color: rgba(255, 255, 255, 0.6)
}

#archives-tags > div, #archives-categories > div {
font-size: 1.5rem;
position: relative;
color: rgba(0, 0, 0, 0.6);
padding: 0 0 0 20px;
margin: 0 0 20px 0;
}

#archives-tags-list, #archives-cate-list {
margin: 0;
padding: 0 0 0 40px
}

.archives-tags-item:before, .archives-cate-item:before {
border-top: 12.5px solid transparent;
border-right: 10px solid rgba(0, 0, 0, 0.6);
border-bottom: 12.5px solid transparent;
content: "";
height: 0;
position: absolute;
top: 0;
left: -10px;
width: 0
}

.archives-tags-item:after, .archives-cate-item:after {
background-color: #f2f2f2;
border-radius: 50%;
content: "";
height: 4px;
position: absolute;
top: 50%;
transform: translateY(-50%);
left: -4px;
width: 4px
}

.archives-tags-item, .archives-cate-item {
font-size: 15px;
line-height: 15px;
list-style: none;
padding: 5px 8px;
margin: 4px 6px;
display: inline-block;
position: relative;
word-break: break-all;
background-color: rgba(0, 0, 0, 0.6);
border-radius: 0 5px 5px 0
}

.archives-tags-item > a, .archives-cate-item > a {
color: #fff
}

#timeline-container {
position: relative
}

#timeline-container:before {
z-index: -1;
content: '';
position: absolute;
width: 4px;
left: 73px;
top: 10px;
height: 100%;
background-color: #dcdcdc
}

.timeline-ym {
position: relative;
display: inline-block;
margin: 10px 0;
padding: 0 12px;
font-size: 1rem;
left: 10px;
background-color: #6f6f6f;
height: 32px;
line-height: 32px;
border-radius: 20px
}

.timeline-ym a {
color: #fff
}

.timeline-box {
padding-left: 90px;
position: relative
}

.timeline-box:before {
content: '';
width: 20px;
height: 20px;
line-height: 20px;
color: #fff;
text-align: center;
background-color: #8a8a8a;
border-radius: 50%;
position: absolute;
left: 65px;
top: 5.5px
}

.timeline-post:before {
content: "";
width: 12px;
height: 12px;
position: absolute;
border-radius: 50%;
background-color: #f2f2f2;
top: 9.5px;
left: -36px;
transition: all .5s ease;
-webkit-transition: all .5s ease
}

.timeline-post {
padding: 0;
font-size: .95rem;
display: block;
min-height: 2rem;
line-height: 2rem;
border-radius: 4px;
position: relative;
margin: 5px 0 5px 15px
}

.timeline-post a {
position: relative
}

.timeline-post a::after {
content: '';
display: block;
width: 0;
height: 2px;
position: absolute;
left: 0;
bottom: -5px;
background: #6f6f6f;
transition: all .5s ease-in-out
}

.timeline-post a:hover::after {
width: 100%
}

.timeline-post:hover::before {
background-color: #474747
}

.timeline-post-time {
position: absolute;
color: #6f6f6f;
font-family: Consolas;
font-size: .9rem;
left: -80px;
top: 0
}</style>
<!-- --><?php //$this->widget('Widget_Metas_Tag_Cloud', 'ignoreZeroCount=0')->to($tags); ?>
<!-- --><?php //if ($tags->have()): ?>
<!-- <div id="archives-tags" class="animated bounceInLeft">-->
<!-- <div>标签分类</div>-->
<!-- <ul id="archives-tags-list">-->
<!-- --><?php //while ($tags->next()): ?>
<!-- <li class="archives-tags-item"><a href="--><?php //$tags->permalink(); ?><!--"-->
<!-- target="_blank">--><?php //$tags->name(); ?><!--</a></li>-->
<!-- --><?php //endwhile; ?>
<!-- </ul>-->
<!-- </div>-->
<!-- --><?php //endif; ?>
<style>html{overflow-x:hidden;overflow-y:auto}#archives-tags,#archives-categories{margin:30px 0;position:relative}.theme-dark #archives-tags>div,.theme-dark #archives-categories>div{color: rgba(255,255,255,0.6)}#archives-tags>div,#archives-categories>div{font-size:1.5rem;position:relative;color:rgba(0,0,0,0.6);padding:0 0 0 20px;margin:0 0 20px 0;}#archives-tags-list,#archives-cate-list{margin:0;padding:0 0 0 40px}.archives-tags-item:before,.archives-cate-item:before{border-top:12.5px solid transparent;border-right:10px solid rgba(0,0,0,0.6);border-bottom:12.5px solid transparent;content:"";height:0;position:absolute;top:0;left:-10px;width:0}.archives-tags-item:after,.archives-cate-item:after{background-color:#f2f2f2;border-radius:50%;content:"";height:4px;position:absolute;top:50%;transform:translateY(-50%);left:-4px;width:4px}.archives-tags-item,.archives-cate-item{font-size:15px;line-height:15px;list-style:none;padding:5px 8px;margin:4px 6px;display:inline-block;position:relative;word-break:break-all;background-color:rgba(0,0,0,0.6);border-radius:0 5px 5px 0}.archives-tags-item>a,.archives-cate-item>a{color:#fff}#timeline-container{position:relative}#timeline-container:before{z-index:0;content:'';position:absolute;width:4px;left:73px;top:10px;height:100%;background-color:#dcdcdc}.timeline-ym{position:relative;display:inline-block;margin:10px 0;padding:0 12px;font-size:1rem;left:10px;background-color:#6f6f6f;height:32px;line-height:32px;border-radius:20px}.timeline-ym a{color:#fff}.timeline-box{padding-left:90px;position:relative}.timeline-box:before{content:'';width:20px;height:20px;line-height:20px;color:#fff;text-align:center;background-color:#8a8a8a;border-radius:50%;position:absolute;left:65px;top:5.5px}.timeline-post:before{content:"";width:12px;height:12px;position:absolute;border-radius:50%;background-color:#f2f2f2;top:9.5px;left:-36px;transition:all .5s ease;-webkit-transition:all .5s ease}.timeline-post{padding:0;font-size:.95rem;display:block;min-height:2rem;line-height:2rem;border-radius:4px;position:relative;margin:5px 0 5px 15px}.timeline-post a{position:relative}.timeline-post a::after{content:'';display:block;width:0;height:2px;position:absolute;left:0;bottom:-5px;background:#6f6f6f;transition:all .5s ease-in-out}.timeline-post a:hover::after{width:100%}.timeline-post:hover::before{background-color:#474747}.timeline-post-time{position:absolute;color:#6f6f6f;font-family:Consolas;font-size:.9rem;left:-80px;top:0}</style>
<div id="archives-categories" class="animated bounceInRight">
<div>圈子</div>
<?php $this->widget('Widget_Metas_Category_List')->to($category); ?>
<?php $category = null;
$this->widget('Widget_Metas_Category_List')->to($category); ?>
<ul id="archives-cate-list">
<?php while ($category->next()): ?>
<li class="archives-cate-item"><a href="<?php $category->permalink(); ?>"
Expand All @@ -224,14 +36,17 @@
</ul>
</div>
<div id="timeline-container" class="animated bounceInLeft">
<?php $this->widget('Widget_Contents_Post_Recent', 'pageSize=200')->to($post); ?>
<?php $post =null;
$this->widget('Widget_Contents_Post_Recent', 'pageSize=200')->to($post); ?>
<?php while ($post->next()): ?>
<?php utils::pageArchives($post); ?>
<?php endwhile; ?>
</div>
</article>
</div>
<?php $this->need('includes/right.php'); ?>
</div>
<?php $this->need('includes/right.php'); ?>
</div>
<?php $this->need('includes/body-layout-end.php');?>

<?php $this->need('includes/footer.php'); ?>
2 changes: 1 addition & 1 deletion assets/admin/css/one.setting.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions assets/blog/css/one.min.css
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/blog/css/one.responsive.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added assets/blog/img/random/1.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/10.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/11.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/12.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/13.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/14.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/15.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/16.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/17.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/18.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/19.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/2.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/20.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/21.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/22.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/23.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/24.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/25.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/3.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/4.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/5.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/6.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/7.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/8.webp
View file
Binary file not shown.
Binary file added assets/blog/img/random/9.webp
View file
Binary file not shown.
Loading

0 comments on commit e7b01fb

Please sign in to comment.