Skip to content

Commit

Permalink
Merge pull request #1 from zhheo/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@zhheo
zhheo authored Oct 9, 2022
2 parents e86b320 + e8dc195 commit de23996
Show file tree
Hide file tree
Showing 6 changed files with 121 additions and 12 deletions.
16 changes: 11 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# TimePlus For Typecho相册模板
# TimePlus For Typecho

![](/info/timeplus.webp)

原作者两年都没有维护这个主题了，很喜欢这个主题想要更快速的迭代优化，所以新开了这个坑。基于原作者的[Time主题](github.com/wclk/time)更新全新的TimePlus。

主题基于原Time主题可能有个人设计偏好，如果你不喜欢这些改动，可以尝试原主题。

## 使用文档

查看[使用文档](https://github.com/zhheo/TimePlus/wiki)
Expand All @@ -16,13 +20,15 @@ Demo: [立即查看](https://plog.zhheo.com/)

配合图片处理: [查看教程](https://github.com/zhheo/TimePlus/wiki/%E9%98%BF%E9%87%8C%E4%BA%91oss%E3%80%81%E5%8F%88%E6%8B%8D%E4%BA%91%E5%82%A8%E5%AD%98%E7%AD%89%E5%82%A8%E5%AD%98%E6%A1%B6%E5%9B%BE%E7%89%87%E5%A4%84%E7%90%86%E4%BB%8B%E7%BB%8D-%E2%80%93%E9%85%8D%E5%90%88-Time%E6%97%B6%E5%85%89%E7%9B%B8%E5%86%8C%E4%BD%BF%E7%94%A8)

## 安装教程
## 版本更新

将主题上传到typecho模板目录 /usr/themes/
### v2.1

## 版本更新
- 【壮举】支持在照片详情中显示图片分类
- 更改关于我弹窗关于主题的链接，链接到本仓库
- 兼容iOS的Safari浏览器图标

### V2.0.0 20221008
### v2.0 20221008

- 修复了点击图片后底部的导航栏会被隐藏的问题
- 修复图片数量不足的时候点击图片导航栏错位问题
Expand Down
103 changes: 99 additions & 4 deletions assets/css/main.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,78 @@
@import url(fontawesome-all.min.css);
@charset "UTF-8";
@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300italic,400,400italic");

:root{
--heo-white: #fff;
--heo-white-op: rgba(255,255,255,0.2);
--heo-black: #000;
--heo-black-op: rgba(0,0,0,0.2);
--heo-none: #00000000;
--heo-gray: #999999;
--heo-gray-op: #9999992b;
--heo-vip: #e5a80d;
--heo-main: var(--heo-theme);
--heo-main-op: var(--heo-theme-op);
--heo-main-none: var(--heo-theme-none);
--heo-shadow-theme: 0 8px 12px -3px var(--heo-theme-op);
--heo-shadow-blackdeep: 0 2px 16px -3px rgba(0, 0, 0,.15);
--heo-shadow-main: 0 8px 12px -3px var(--heo-main-op);
--heo-shadow-blue: 0 8px 12px -3px rgba(40, 109, 234,.20);
--heo-shadow-white: 0 8px 12px -3px rgba(255, 255, 255,.20);
--heo-shadow-black: 0 0 12px 4px rgba(0, 0, 0,.05);
--heo-shadow-yellow: 0px 38px 77px -26px rgba(255, 201, 62,.12);
--heo-shadow-red: 0 8px 12px -3px #ee7d7936;
--heo-shadow-green: 0 8px 12px -3px #87ee7936;
--heo-logo-color: linear-gradient(215deg,#4584ff 0%,#cf0db9 100%);
--heo-snackbar-time: 5s;
--style-border: 1px solid var(--heo-card-border);
--style-border-always: 1px solid var(--heo-card-border);
--style-border-hover: 1px solid var(--heo-main);
--style-border-hover-always: 1px solid var(--heo-main);
--style-border-dashed: 1px dashed var(--heo-theme-op);
}

::selection {
background: var(--heo-fontcolor);
color: var(--heo-background);
}

:root {
--heo-theme: #0084FF;
--heo-theme-op: #0084FF23;
--heo-theme-op-deep: #0084ffdd;
--heo-theme-none: #0084FF00;
--heo-blue: #0084FF;
--heo-red: #FF3842;
--heo-pink: #FF7C7C;
--heo-green: #57bd6a;
--heo-yellow: #ffc93e;
--heo-yellow-op: #ffc93e30;
--heo-orange: #ff953e;
--heo-fontcolor: #F7F7FA;
--heo-background: #18171d;
--heo-reverse: #fff;
--heo-maskbg: rgba(0,0,0, 0.6);
--heo-maskbgdeep: rgba(0,0,0, 0.85);
--heo-hovertext: #0A84FF;
--heo-ahoverbg: #fff;
--heo-lighttext: #f2b94b;
--heo-secondtext: #a1a2b8;
--heo-scrollbar: rgba(200, 200, 223, 0.4);
--heo-card-btn-bg: #30343f;
--heo-post-blockquote-bg: #000;
--heo-post-tabs-bg: #121212;
--heo-secondbg: #30343f;
--heo-shadow-nav:0 5px 20px 0px rgba(28, 28, 28, 0.4);
--heo-card-bg: #1d1e22;
--heo-card-bg-op: var(--heo-white-op);
--heo-card-bg-none: #1d1b2600;
--heo-shadow-lightblack:0 5px 12px -5px rgba(102, 68, 68, 0.0);
--heo-shadow-light2black:0 5px 12px -5px rgba(102, 68, 68, 0.0);
--heo-card-border: #282829;
--heo-shadow-border: 0 8px 16px -4px #00000050;
--style-border-forever: 2px solid var(--heo-lighttext);
}

/*
* 一个基于Typecho的相册模板。前端采用开源模板Multiverse，请尊重劳动成果 你可以在<a href="https://www.zmki.cn">钻芒博客</a>获得更多关于此皮肤的信息
*
Expand Down Expand Up @@ -291,7 +363,7 @@ input, select, textarea {

a:hover {
border-bottom-color: transparent;
color: #34a58e !important;
color: var(--heo-theme);
}

strong, b {
Expand Down Expand Up @@ -327,6 +399,7 @@ input, select, textarea {

h2 {
font-size: 2.25em;
line-height: 1;
}

h3 {
Expand Down Expand Up @@ -1343,22 +1416,26 @@ input, select, textarea {
background-image: -webkit-linear-gradient(to top, rgba(16,16,16,0.45) 25%, rgba(16,16,16,0) 100%);
background-image: -ms-linear-gradient(to top, rgba(16,16,16,0.45) 25%, rgba(16,16,16,0) 100%);
background-image: linear-gradient(to top, rgba(16,16,16,0.45) 25%, rgba(16,16,16,0) 100%);
bottom: 0;
bottom: 0rem;
cursor: default;
left: 0;
position: absolute;
text-align: left;
width: 100%;
z-index: 2;
padding-bottom: 2rem;
display: flex;
flex-direction: column;
}

.poptrox-popup .caption h2, .poptrox-popup .caption h3, .poptrox-popup .caption h4, .poptrox-popup .caption h5, .poptrox-popup .caption h6 {
margin: 0 0 0.5em 0;
margin: 0;
}

.poptrox-popup .caption p {
color: #ffffff;
font-size: 15px;
margin: 0.5rem 0!important;
}

.poptrox-popup .loader {
Expand Down Expand Up @@ -1405,6 +1482,24 @@ input, select, textarea {
opacity: 1.0 !important;
}

.tag-categorys {
display: flex;
}

.tag-categorys a {
padding: 4px 6px;
border-radius: 8px;
background: var(--heo-white-op);
font-size: 12px;
color: var(--heo-fontcolor);
transition: 0.3s;
}

.tag-categorys a:hover {
background: var(--heo-theme);
color: var(--heo-white);
}

@media screen and (max-width: 980px) {

.poptrox-popup .closer {
Expand Down
5 changes: 4 additions & 1 deletion functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ function themeConfig($form) {
$IndexName = new Typecho_Widget_Helper_Form_Element_Text('IndexName', NULL, '时光相册', _t('首页的名称(必填)'), _t('输入你的首页显示的名称'));
$form->addInput($IndexName);
//网站图标
$IconUrl = new Typecho_Widget_Helper_Form_Element_Text('IconUrl', NULL, '', _t('网站图标地址'), _t('输入网站的图标'));
$IconUrl = new Typecho_Widget_Helper_Form_Element_Text('IconUrl', NULL, '', _t('网站图标地址'), _t('输入网站的图标（建议200px宽度png）'));
$form->addInput($IconUrl);
//Apple网站图标
$AppleIcon = new Typecho_Widget_Helper_Form_Element_Text('AppleIcon', NULL, '', _t('兼容Apple设备的图标'), _t('建议使用有背景无圆角矩形图标，在被iOS添加到书签或桌面后显示此图标（建议200px宽度png）'));
$form->addInput($AppleIcon);
//首页名称后缀（必填）
$Indexdict = new Typecho_Widget_Helper_Form_Element_Text('Indexdict', NULL, '采用Time。', _t('首页的名称后缀(必填)'), _t('输入你的首页显示的名称后缀'));
$form->addInput($Indexdict);
Expand Down
9 changes: 7 additions & 2 deletions index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 一款相册主题，Plus系列目前由Heo维护
* @package TimePlus
* @author zhheo
* @version 2.0.0
* @version 2.1
* @link https://zhheo.com/
*/
?>
Expand All @@ -15,6 +15,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
<meta name="keywords" content="<?php $this->options->keywords(); ?>"/>
<meta name="description" content="<?php $this->options->description(); ?>"/>
<link rel="apple-touch-icon" href="<?php $this->options->AppleIcon(); ?>">
<meta name="apple-mobile-web-app-title" content="<?php $this->options->IndexName(); ?>">
<link rel="bookmark" href="<?php $this->options->AppleIcon(); ?>">
<link rel="apple-touch-icon-precomposed" sizes="180x180" href="<?php $this->options->AppleIcon(); ?>" >
<link rel="icon" href="<?php $this->options->IconUrl() ?>">
<link rel="stylesheet" type="text/css" href="<?php $this->options->themeUrl('assets/css/main.css'); ?>" />
<link rel="stylesheet" type="text/css" href="<?php $this->options->themeUrl('assets/css/noscript.css'); ?>" />
Expand Down Expand Up @@ -47,6 +51,7 @@
</a>
<h2><?php $this->title() ?></h2>
<p><?php $this->content('Continue Reading...'); ?></p>
<li class="tag-categorys"><?php $this->category(','); ?></li>
</article>
<?php endwhile; ?>
</div>
Expand All @@ -71,7 +76,7 @@
<span style="color: #b5b5b5; font-size: 0.8em;">
<?php $this->options->cnzz()?>
<p class="copyright">
&copy; Design ZHHEO & ZMKI THEME:<a href="https://www.zmki.cn/4953.html" target="_blank" rel="noopener nofollow">TimePro</a>. ICP备案号:<a href="http://beian.miit.gov.cn/" target="_blank" rel="noopener nofollow"><?php $this->options->icp()?></a>
&copy; 设计 ZHHEO & ZMKI 主题：<a href="https://github.com/zhheo/TimePlus" target="_blank" rel="noopener nofollow">TimePro</a>. ICP备案号:<a href="http://beian.miit.gov.cn/" target="_blank" rel="noopener nofollow"><?php $this->options->icp()?></a>
</p>
</div>
</div>
Expand Down
Binary file added info/timeplus.webp
View file
Binary file not shown.
Binary file modified screenshot.png
100755 → 100644
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit de23996

Please sign in to comment.