summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBigCoke233 <hi@guhub.cn>2020-04-12 16:10:53 +0800
committerBigCoke233 <hi@guhub.cn>2020-04-12 16:10:53 +0800
commitc4d20db153d8e810940ee505c194a9c4dcf58d54 (patch)
tree8c3353c53bd2986a96df8b7c3ece1d54660e795d
parent8a03995d72a9afe999c243cffd1fae05b441c172 (diff)
:book: 中英文分割开关 & 优化友情链接
- 现在允许在后台选择是否开始 Pangu,js 分割中英文 - 友情链接的头像不在通过 div 的背景图展示,而是 img 标签,并适配懒加载
-rw-r--r--assets/css/main/page.css8
-rw-r--r--assets/css/main/post.css2
-rw-r--r--assets/js/miracles.min.js2
-rw-r--r--includes/footer.php1
-rw-r--r--libs/Contents.php4
-rwxr-xr-xlibs/Options.php4
6 files changed, 16 insertions, 5 deletions
diff --git a/assets/css/main/page.css b/assets/css/main/page.css
index e212bc2..a5aa631 100644
--- a/assets/css/main/page.css
+++ b/assets/css/main/page.css
@@ -130,6 +130,14 @@
.links-container {
padding: 6px;
}
+.links-img {
+ padding: 0
+}
+.links-img img {
+ margin: 0;
+ width: 100%;
+ height: 100%
+}
/* Saying 说说 */
.saying-meta {
diff --git a/assets/css/main/post.css b/assets/css/main/post.css
index e122706..92ab203 100644
--- a/assets/css/main/post.css
+++ b/assets/css/main/post.css
@@ -201,7 +201,7 @@
border-radius: 3px;
max-width: 100%
}
-.post-content img:not(.owo-img) {
+.post-content img:not(.owo-img,.links-img img) {
margin: 25px auto;
}
.post-content blockquote p {
diff --git a/assets/js/miracles.min.js b/assets/js/miracles.min.js
index dff9298..9027391 100644
--- a/assets/js/miracles.min.js
+++ b/assets/js/miracles.min.js
@@ -188,7 +188,7 @@ function owoLoad() {
//Pangu.js
function panguLoad() {
document.addEventListener('DOMContentLoaded', () => {
- pangu.autoSpacingPage();
+ if(panguLoadAllow==true) pangu.autoSpacingPage();
});
}
diff --git a/includes/footer.php b/includes/footer.php
index 94c9d48..670367e 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -28,6 +28,7 @@
?>
<!-- Varribles and Functions -->
<script>
+ var panguLoadAllow = <?php if($this->options->pangu==1):?>false<?php else:?>true<?php endif;?>;
var allowNavAero = <?php if($this->options->navAero==1):?>false<?php else:?>true<?php endif;?>;
var siteurl = '<?php $this->options->SiteUrl() ;?>';
var owoJson = '<?php Utils::indexTheme('assets/OwO.json'); ?>';
diff --git a/libs/Contents.php b/libs/Contents.php
index 31f740f..8149f55 100644
--- a/libs/Contents.php
+++ b/libs/Contents.php
@@ -78,7 +78,7 @@ class Contents
$rp = '<div class="col-lg-2 col-6 col-md-3 links-container">
<a href="${2}" title="${4}" target="_blank" class="links-link">
<div class="links-item">
- <div class="links-img" style="background:url(\'${3}\');width: 100%;padding-top: 100%;background-repeat: no-repeat;background-size: cover;"></div>
+ <div class="links-img"><img src=\'${3}\'></div>
<div class="links-title">
<h4>${1}</h4>
</div>
@@ -119,7 +119,7 @@ class Contents
$linksList .= '<div class="col-lg-2 col-6 col-md-3 links-container">
<a href="' . $link . '" title="' . $des . '" target="_blank" class="links-link">
<div class="links-item">
- <div class="links-img" style="background:url(\'' . $avatar . '\');width: 100%;padding-top: 100%;background-repeat: no-repeat;background-size: cover;"></div>
+ <div class="links-img"><img src=\''.$avatar.'\'></div>
<div class="links-title">
<h4>' . $name . '</h4>
</div>
diff --git a/libs/Options.php b/libs/Options.php
index 226e0fc..c3d84d0 100755
--- a/libs/Options.php
+++ b/libs/Options.php
@@ -138,8 +138,10 @@ function themeConfig($form) {
$form->addInput($CDN);
$customCDN = new Typecho_Widget_Helper_Form_Element_Text('customCDN', NULL, '', _t('自定义 CDN'), _t('输入 CDN 的链接,要保证写入的路径下,目录结构和主题的 assets 目录下一致'));
$form->addInput($customCDN);
- $ifShowRTA = new Typecho_Widget_Helper_Form_Element_Select('ifShowRTA',array('0'=>'不显示','1'=>'显示'),'0','阅读时长提示 RTA','在文章前加入阅读时长提示,增进用户体验<hr>');
+ $ifShowRTA = new Typecho_Widget_Helper_Form_Element_Select('ifShowRTA',array('0'=>'不显示','1'=>'显示'),'0','阅读时长提示 RTA','在文章前加入阅读时长提示,增进用户体验');
$form->addInput($ifShowRTA);
+ $pangu = new Typecho_Widget_Helper_Form_Element_Select('pangu',array('0'=>'启用','1'=>'关闭'),'0','自动分割中英文(pangu.js)','自动分割网页中的中英文,在全角字符和半角字符之间加上空格,也会修复一些标点符号的错误(.=>。),可能会有误判或是有人不喜欢,所以在这里加个按钮<hr>');
+ $form->addInput($pangu);
//custom style
$grayTheme = new Typecho_Widget_Helper_Form_Element_Select('grayTheme',array('0'=>'关闭','1'=>'开启'),'0','<h2>个性化</h2>哀悼模式','打开后网站变为黑白');