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

Commit e7b01fb

Browse files
gogobodygogobody
committed
Merge branch 'dev'
2 parents 1145ff8 + 38ff49c commit e7b01fb

File tree

106 files changed

+3644
-1877
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+3644
-1877
lines changed

‎404.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
22
<?php $this->need('includes/header.php'); ?>
3-
<div class="container-lg animate__animated animate__fadeIn" id="pjax-container">
4-
<div class="row">
5-
<?php $this->need('includes/nav.php');?>
6-
<div class="col-xl-7 col-md-6 col-12">
3+
<?php $this->need('includes/body-layout.php');?>
4+
<div class="hbox hbox-auto-xs hbox-auto-sm index">
5+
<div class="col center-part">
76
<div class="error-page">
87
<h2 class="post-title">404 - <?php _e('页面没找到'); ?></h2>
98
<p><?php _e('你想查看的页面已被转移或删除了, 要不要搜索看看: '); ?></p>
@@ -15,5 +14,5 @@
1514
</div>
1615
<?php $this->need('includes/right.php');?>
1716
</div>
18-
</div>
17+
<?php $this->need('includes/body-layout-end.php');?>
1918
<?php $this->need('includes/footer.php'); ?>

‎README.md‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
## onecircle 一个圈子，基于typecho
22

33
## 名字就叫一个圈子。
4-
## version：2.8
4+
## version：3.0
55
## 平台：typecho
66

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

9+
## 主题文档
10+
更多请查看[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)
11+
912
(￢_￢)
1013
目前特色有：
1114
1. 前端仿推特
@@ -15,6 +18,7 @@
1518
5. 支持用户注册默认更改权限为贡献者，并自动通过审核，这样新注册的用户也能自己发推了
1619
6. 支持给每个新注册用户添加个人签名和tag
1720
7. 支持免费的sm 图床
21+
8. 支持博客页
1822

1923
## changeLog
2024
v1.6 支持 pjax，以及前台登录发布文章，加入progress动画
@@ -30,6 +34,7 @@ v2.5 添加用户性别和个人情感状态
3034
v2.6 修复评论bug，修改link 显示
3135
v2.7 图床插件支持上传图片到本地，添加首页评论显示
3236
v2.8 添加 lazyload ，将默认的gallery 原始的background显示方式迁移至src显示
37+
v3.0 支持博客页
3338
## 安装
3439
下载 release 包：
3540
内含：
@@ -144,4 +149,4 @@ links
144149
### 感谢以下作者的辛苦付出
145150
- compress https://javascript-minifier.com/
146151
- css compress https://www.runoob.com/csspack
147-
- 部分代码来自handsome、 [landstar](https://dyedd.cn)、油油的twitter等主题，感谢作者的辛苦付出
152+
- 部分代码来自handsome、 [landstar](https://dyedd.cn)、油油的twitter、[joe博客](http://ae.js.cn/about.html) 等主题，感谢作者的辛苦付出

‎archive.php‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,16 @@
3131
?>
3232
<?php $this->need('includes/header.php'); ?>
3333

34-
<div class="container-lg animate__animated animate__fadeIn" id="pjax-container">
35-
<div class="row">
36-
<?php $this->need('includes/nav.php'); ?>
37-
<div class="col-xl-10 col-md-10 col-12 achieve-container">
34+
<?php $this->need('includes/body-layout.php');?>
35+
<div class="hbox hbox-auto-xs hbox-auto-sm archive">
36+
<div class="archive-container">
3837
<?php if ($this->is('author')): ?>
3938
<?php $this->need('components/archive/archive-author.php') ?>
4039
<?php elseif ($this->is('category')): ?>
4140
<?php $this->need('components/archive/archive-category.php') ?>
4241
<?php endif; ?>
43-
<div class="achieve-content">
44-
<div class="col-12 col-md-8 outer">
45-
42+
<div class="archive-content tabindex-<?_e($tabIndex);?>">
43+
<div class="outer">
4644
<div class="react-tabs" data-tabs="true">
4745
<div class="line"></div>
4846
<ul class="react-tabs__tab-list">
@@ -148,14 +146,13 @@ class="sc-AxjAm sc-AxirZ eGdPrb"><img
148146
</div>
149147
</div>
150148

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

153151
</div>
154-
<?php $this->need('includes/achieve-right.php'); ?>
152+
<?php $this->need('includes/archive-right.php'); ?>
155153
</div>
156154

157155
</div>
158156
</div>
159-
</div>
160-
157+
<?php $this->need('includes/body-layout-end.php');?>
161158
<?php $this->need('includes/footer.php'); ?>

‎archives.php‎

Lines changed: 12 additions & 197 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
if (!defined('__TYPECHO_ROOT_DIR__')) exit;
88
$this->need('includes/header.php');
99
?>
10-
<div class="container-lg animate__animated animate__fadeIn" id="pjax-container">
11-
<div class="row">
12-
<?php $this->need('includes/nav.php'); ?>
13-
14-
<div class="col-xl-7 col-md-7 col-12 page" id="pjax-container">
10+
<?php $this->need('includes/body-layout.php');?>
11+
<div class="hbox hbox-auto-xs hbox-auto-sm archive-page index">
12+
<div class="col center-part">
13+
<div class="page">
1514
<article class="post" id="post-<?php $this->cid(); ?>">
1615
<nav aria-label="breadcrumb">
1716
<ol class="breadcrumb">
@@ -24,198 +23,11 @@
2423
<?php endif; ?>
2524
</ol>
2625
</nav>
27-
<!-- <h1 class="article-title"><a href="--><?php //$this->permalink(); ?><!--">--><?php //$this->title(); ?><!--</a></h1>-->
28-
<style>
29-
html {
30-
overflow-x: hidden;
31-
overflow-y: auto
32-
}
33-
34-
#archives-tags, #archives-categories {
35-
margin: 30px 0;
36-
position: relative
37-
}
38-
39-
.theme-dark #archives-tags > div, .theme-dark #archives-categories > div {
40-
color: rgba(255, 255, 255, 0.6)
41-
}
42-
43-
#archives-tags > div, #archives-categories > div {
44-
font-size: 1.5rem;
45-
position: relative;
46-
color: rgba(0, 0, 0, 0.6);
47-
padding: 0 0 0 20px;
48-
margin: 0 0 20px 0;
49-
}
50-
51-
#archives-tags-list, #archives-cate-list {
52-
margin: 0;
53-
padding: 0 0 0 40px
54-
}
55-
56-
.archives-tags-item:before, .archives-cate-item:before {
57-
border-top: 12.5px solid transparent;
58-
border-right: 10px solid rgba(0, 0, 0, 0.6);
59-
border-bottom: 12.5px solid transparent;
60-
content: "";
61-
height: 0;
62-
position: absolute;
63-
top: 0;
64-
left: -10px;
65-
width: 0
66-
}
67-
68-
.archives-tags-item:after, .archives-cate-item:after {
69-
background-color: #f2f2f2;
70-
border-radius: 50%;
71-
content: "";
72-
height: 4px;
73-
position: absolute;
74-
top: 50%;
75-
transform: translateY(-50%);
76-
left: -4px;
77-
width: 4px
78-
}
79-
80-
.archives-tags-item, .archives-cate-item {
81-
font-size: 15px;
82-
line-height: 15px;
83-
list-style: none;
84-
padding: 5px 8px;
85-
margin: 4px 6px;
86-
display: inline-block;
87-
position: relative;
88-
word-break: break-all;
89-
background-color: rgba(0, 0, 0, 0.6);
90-
border-radius: 0 5px 5px 0
91-
}
92-
93-
.archives-tags-item > a, .archives-cate-item > a {
94-
color: #fff
95-
}
96-
97-
#timeline-container {
98-
position: relative
99-
}
100-
101-
#timeline-container:before {
102-
z-index: -1;
103-
content: '';
104-
position: absolute;
105-
width: 4px;
106-
left: 73px;
107-
top: 10px;
108-
height: 100%;
109-
background-color: #dcdcdc
110-
}
111-
112-
.timeline-ym {
113-
position: relative;
114-
display: inline-block;
115-
margin: 10px 0;
116-
padding: 0 12px;
117-
font-size: 1rem;
118-
left: 10px;
119-
background-color: #6f6f6f;
120-
height: 32px;
121-
line-height: 32px;
122-
border-radius: 20px
123-
}
124-
125-
.timeline-ym a {
126-
color: #fff
127-
}
128-
129-
.timeline-box {
130-
padding-left: 90px;
131-
position: relative
132-
}
133-
134-
.timeline-box:before {
135-
content: '';
136-
width: 20px;
137-
height: 20px;
138-
line-height: 20px;
139-
color: #fff;
140-
text-align: center;
141-
background-color: #8a8a8a;
142-
border-radius: 50%;
143-
position: absolute;
144-
left: 65px;
145-
top: 5.5px
146-
}
147-
148-
.timeline-post:before {
149-
content: "";
150-
width: 12px;
151-
height: 12px;
152-
position: absolute;
153-
border-radius: 50%;
154-
background-color: #f2f2f2;
155-
top: 9.5px;
156-
left: -36px;
157-
transition: all .5s ease;
158-
-webkit-transition: all .5s ease
159-
}
160-
161-
.timeline-post {
162-
padding: 0;
163-
font-size: .95rem;
164-
display: block;
165-
min-height: 2rem;
166-
line-height: 2rem;
167-
border-radius: 4px;
168-
position: relative;
169-
margin: 5px 0 5px 15px
170-
}
171-
172-
.timeline-post a {
173-
position: relative
174-
}
175-
176-
.timeline-post a::after {
177-
content: '';
178-
display: block;
179-
width: 0;
180-
height: 2px;
181-
position: absolute;
182-
left: 0;
183-
bottom: -5px;
184-
background: #6f6f6f;
185-
transition: all .5s ease-in-out
186-
}
187-
188-
.timeline-post a:hover::after {
189-
width: 100%
190-
}
191-
192-
.timeline-post:hover::before {
193-
background-color: #474747
194-
}
195-
196-
.timeline-post-time {
197-
position: absolute;
198-
color: #6f6f6f;
199-
font-family: Consolas;
200-
font-size: .9rem;
201-
left: -80px;
202-
top: 0
203-
}</style>
204-
<!-- --><?php //$this->widget('Widget_Metas_Tag_Cloud', 'ignoreZeroCount=0')->to($tags); ?>
205-
<!-- --><?php //if ($tags->have()): ?>
206-
<!-- <div id="archives-tags" class="animated bounceInLeft">-->
207-
<!-- <div>标签分类</div>-->
208-
<!-- <ul id="archives-tags-list">-->
209-
<!-- --><?php //while ($tags->next()): ?>
210-
<!-- <li class="archives-tags-item"><a href="--><?php //$tags->permalink(); ?><!--"-->
211-
<!-- target="_blank">--><?php //$tags->name(); ?><!--</a></li>-->
212-
<!-- --><?php //endwhile; ?>
213-
<!-- </ul>-->
214-
<!-- </div>-->
215-
<!-- --><?php //endif; ?>
26+
<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>
21627
<div id="archives-categories" class="animated bounceInRight">
21728
<div>圈子</div>
218-
<?php $this->widget('Widget_Metas_Category_List')->to($category); ?>
29+
<?php $category = null;
30+
$this->widget('Widget_Metas_Category_List')->to($category); ?>
21931
<ul id="archives-cate-list">
22032
<?php while ($category->next()): ?>
22133
<li class="archives-cate-item"><a href="<?php $category->permalink(); ?>"
@@ -224,14 +36,17 @@
22436
</ul>
22537
</div>
22638
<div id="timeline-container" class="animated bounceInLeft">
227-
<?php $this->widget('Widget_Contents_Post_Recent', 'pageSize=200')->to($post); ?>
39+
<?php $post =null;
40+
$this->widget('Widget_Contents_Post_Recent', 'pageSize=200')->to($post); ?>
22841
<?php while ($post->next()): ?>
22942
<?php utils::pageArchives($post); ?>
23043
<?php endwhile; ?>
23144
</div>
23245
</article>
23346
</div>
234-
<?php $this->need('includes/right.php'); ?>
23547
</div>
48+
<?php $this->need('includes/right.php'); ?>
23649
</div>
50+
<?php $this->need('includes/body-layout-end.php');?>
51+
23752
<?php $this->need('includes/footer.php'); ?>

‎assets/admin/css/one.setting.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/blog/css/one.min.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/blog/css/one.responsive.min.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/blog/img/random/1.webp‎

14.4 KB
Loading

‎assets/blog/img/random/10.webp‎

80.2 KB
Loading

‎assets/blog/img/random/11.webp‎

34.8 KB
Loading

0 commit comments

Comments
 (0)