This commit is contained in:
杜恒 2021-02-24 08:50:44 +08:00
parent 4190ddca3a
commit f902e6127d
6 changed files with 143 additions and 101 deletions

View File

@ -1 +1 @@
*{margin:0;padding:0;box-sizing:border-box;outline:none;-webkit-tap-highlight-color:transparent}::-webkit-scrollbar{width:8px;height:8px}::-webkit-scrollbar-thumb{border-radius:4px;background:var(--seat)}::-webkit-scrollbar-track{background:transparent}::-moz-selection{color:#fff;background:var(--theme)}::selection{color:#fff;background:var(--theme)}body{font-size:14px;font-family:'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom)}body::before{content:'';position:fixed;top:0;left:0;right:0;bottom:0;z-index:-520;pointer-events:none}input[type='text']{-webkit-appearance:none;border-radius:0;font-size:13px;font-weight:500}iframe{display:block;border:none;margin:0 auto;vertical-align:middle}textarea{font-size:14px;resize:none;-webkit-appearance:none}li{list-style:none}a{text-decoration:none}h1,h2,h3,h4,h5,h6{font-weight:500}img{border:0;vertical-align:middle}img[src=''],img:not([src]){border:0;opacity:0}svg,canvas{vertical-align:middle}button{cursor:pointer;-webkit-appearance:none;font-size:13px}table{border-collapse:collapse;border-spacing:0}.joe_main{min-width:0;flex:1;padding:15px 0}.joe_container{display:flex;width:100%;margin:0 auto;padding:0 15px}@media (min-width: 576px){.joe_container{max-width:540px}}@media (min-width: 768px){.joe_container{max-width:720px}}@media (min-width: 992px){.joe_container{max-width:960px}}@media (min-width: 1200px){.joe_container{max-width:1140px}}@media (min-width: 1400px){.joe_container{max-width:1320px}} *{margin:0;padding:0;box-sizing:border-box;outline:none;-webkit-tap-highlight-color:transparent}::-webkit-scrollbar{width:8px;height:8px}::-webkit-scrollbar-thumb{border-radius:4px;background:var(--seat)}::-webkit-scrollbar-track{background:transparent}::-moz-selection{color:#fff;background:var(--theme)}::selection{color:#fff;background:var(--theme)}body{font-size:14px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom)}body::before{content:'';position:fixed;top:0;left:0;right:0;bottom:0;z-index:-520;pointer-events:none}input[type='text']{-webkit-appearance:none;border-radius:0;font-size:13px;font-weight:500}iframe{display:block;border:none;margin:0 auto;vertical-align:middle}textarea{font-size:14px;resize:none;-webkit-appearance:none}li{list-style:none}a{text-decoration:none}h1,h2,h3,h4,h5,h6{font-weight:500}img{border:0;vertical-align:middle}img[src=''],img:not([src]){border:0;opacity:0}svg,canvas{vertical-align:middle}button{cursor:pointer;-webkit-appearance:none;font-size:13px}table{border-collapse:collapse;border-spacing:0}.joe_main{min-width:0;flex:1;padding:15px 0}.joe_container{display:flex;width:100%;margin:0 auto;padding:0 15px}@media (min-width: 576px){.joe_container{max-width:540px}}@media (min-width: 768px){.joe_container{max-width:720px}}@media (min-width: 992px){.joe_container{max-width:960px}}@media (min-width: 1200px){.joe_container{max-width:1140px}}@media (min-width: 1400px){.joe_container{max-width:1320px}}

View File

@ -1,75 +1,75 @@
* { * {
margin: 0; margin: 0;
padding: 0; padding: 0;
box-sizing: border-box; box-sizing: border-box;
outline: none; outline: none;
-webkit-tap-highlight-color: transparent; -webkit-tap-highlight-color: transparent;
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 8px; width: 8px;
height: 8px; height: 8px;
} }
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
border-radius: 4px; border-radius: 4px;
background: var(--seat); background: var(--seat);
} }
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
background: transparent; background: transparent;
} }
::selection { ::selection {
color: #fff; color: #fff;
background: var(--theme); background: var(--theme);
} }
body { body {
font-size: 14px; font-size: 14px;
/* 我们对字体进行统一规范,力求在各个操作系统下都有最佳展示效果。 */ -webkit-font-smoothing: antialiased;
font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif; -moz-osx-font-smoothing: grayscale;
padding-bottom: constant(safe-area-inset-bottom); padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom);
} }
body::before { body::before {
content: ''; content: '';
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
z-index: -520; z-index: -520;
pointer-events: none; pointer-events: none;
} }
input[type='text'] { input[type='text'] {
-webkit-appearance: none; -webkit-appearance: none;
border-radius: 0; border-radius: 0;
font-size: 13px; font-size: 13px;
font-weight: 500; font-weight: 500;
} }
iframe { iframe {
display: block; display: block;
border: none; border: none;
margin: 0 auto; margin: 0 auto;
vertical-align: middle; vertical-align: middle;
} }
textarea { textarea {
font-size: 14px; font-size: 14px;
resize: none; resize: none;
-webkit-appearance: none; -webkit-appearance: none;
} }
li { li {
list-style: none; list-style: none;
} }
a { a {
text-decoration: none; text-decoration: none;
} }
h1, h1,
@ -78,71 +78,71 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-weight: 500; font-weight: 500;
} }
img { img {
border: 0; border: 0;
vertical-align: middle; vertical-align: middle;
} }
img[src=''], img[src=''],
img:not([src]) { img:not([src]) {
border: 0; border: 0;
opacity: 0; opacity: 0;
} }
svg, svg,
canvas { canvas {
vertical-align: middle; vertical-align: middle;
} }
button { button {
cursor: pointer; cursor: pointer;
-webkit-appearance: none; -webkit-appearance: none;
font-size: 13px; font-size: 13px;
} }
table { table {
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; border-spacing: 0;
} }
.joe_main { .joe_main {
min-width: 0; min-width: 0;
flex: 1; flex: 1;
padding: 15px 0; padding: 15px 0;
} }
.joe_container { .joe_container {
display: flex; display: flex;
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
padding: 0 15px; padding: 0 15px;
} }
@media (min-width: 576px) { @media (min-width: 576px) {
.joe_container { .joe_container {
max-width: 540px; max-width: 540px;
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.joe_container { .joe_container {
max-width: 720px; max-width: 720px;
} }
} }
@media (min-width: 992px) { @media (min-width: 992px) {
.joe_container { .joe_container {
max-width: 960px; max-width: 960px;
} }
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
.joe_container { .joe_container {
max-width: 1140px; max-width: 1140px;
} }
} }
@media (min-width: 1400px) { @media (min-width: 1400px) {
.joe_container { .joe_container {
max-width: 1320px; max-width: 1320px;
} }
} }

View File

@ -3,7 +3,7 @@
/* 获取主题当前版本号 */ /* 获取主题当前版本号 */
function _getVersion() function _getVersion()
{ {
return "5.4.5"; return "5.4.6";
}; };
/* 判断是否是手机 */ /* 判断是否是手机 */

View File

@ -326,6 +326,18 @@ function themeConfig($form)
$JBirthDay->setAttribute('class', 'joe_content joe_global'); $JBirthDay->setAttribute('class', 'joe_content joe_global');
$form->addInput($JBirthDay); $form->addInput($JBirthDay);
$JCustomFont = new Typecho_Widget_Helper_Form_Element_Text(
'JCustomFont',
NULL,
NULL,
'自定义网站字体(非必填)',
'介绍:用于修改全站字体,填写则使用引入的字体,不填写使用默认字体 <br>
格式字体URL链接 <br>
注意由于体积文件较大建议使用cdn链接方式进行引入'
);
$JCustomFont->setAttribute('class', 'joe_content joe_global');
$form->addInput($JCustomFont);
$JAside = new Typecho_Widget_Helper_Form_Element_Checkbox( $JAside = new Typecho_Widget_Helper_Form_Element_Checkbox(
'JAside', 'JAside',
array( array(

58
public/config.php Normal file
View File

@ -0,0 +1,58 @@
<script>
localStorage.getItem("data-night") && document.querySelector("html").setAttribute("data-night", "night");
window.Joe = {
LIVE2D: '<?php $this->options->JLive2d() ?>',
BASE_API: '<?php echo $this->options->rewrite == 0 ? '/index.php/joe/api' : '/joe/api' ?>',
DYNAMIC_BACKGROUND: '<?php $this->options->JDynamic_Background() ?>',
WALLPAPER_BACKGROUND_PC: '<?php $this->options->JWallpaper_Background_PC() ?>',
IS_MOBILE: /windows phone|iphone|android/gi.test(window.navigator.userAgent),
BAIDU_PUSH: <?php echo $this->options->JBaiduToken ? 'true' : 'false' ?>,
DOCUMENT_TITLE: '<?php $this->options->JDocumentTitle() ?>',
LAZY_LOAD: '<?php _getLazyload() ?>',
BIRTHDAY: '<?php $this->options->JBirthDay() ?>',
}
function detectIE() {
var n = window.navigator.userAgent,
e = n.indexOf("MSIE ");
if (e > 0) {
return parseInt(n.substring(e + 5, n.indexOf(".", e)), 10)
}
if (n.indexOf("Trident/") > 0) {
var r = n.indexOf("rv:");
return parseInt(n.substring(r + 3, n.indexOf(".", r)), 10)
}
var i = n.indexOf("Edge/");
return i > 0 && parseInt(n.substring(i + 5, n.indexOf(".", i)), 10)
};
detectIE() && (alert('当前站点不支持IE浏览器或您开启了兼容模式请使用其他浏览器访问或关闭兼容模式。'), (location.href = 'https://www.baidu.com'))
</script>
<style>
@font-face {
font-family: 'Joe Font';
font-weight: 400;
font-style: normal;
src: url('<?php $this->options->JCustomFont() ?>');
font-display: swap;
}
body {
<?php if ($this->options->JCustomFont) : ?>font-family: 'Joe Font';
<?php else : ?>font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
<?php endif; ?>
}
body::before {
background: <?php if (_isMobile()) {
echo $this->options->JWallpaper_Background_WAP ? "url(" . $this->options->JWallpaper_Background_WAP . ")" : "#f5f5f5";
} else {
echo $this->options->JWallpaper_Background_PC ? "url(" . $this->options->JWallpaper_Background_PC . ")" : "#f5f5f5";
} ?>;
background-position: center 0;
background-repeat: no-repeat;
background-size: cover;
}
<?php $this->options->JCustomCSS() ?>
</style>

View File

@ -1,32 +1,4 @@
<script> <?php $this->need('public/config.php'); ?>
localStorage.getItem("data-night") && document.querySelector("html").setAttribute("data-night", "night");
window.Joe = {
LIVE2D: '<?php $this->options->JLive2d() ?>',
BASE_API: '<?php echo $this->options->rewrite == 0 ? '/index.php/joe/api' : '/joe/api' ?>',
DYNAMIC_BACKGROUND: '<?php $this->options->JDynamic_Background() ?>',
WALLPAPER_BACKGROUND_PC: '<?php $this->options->JWallpaper_Background_PC() ?>',
IS_MOBILE: /windows phone|iphone|android/gi.test(window.navigator.userAgent),
BAIDU_PUSH: <?php echo $this->options->JBaiduToken ? 'true' : 'false' ?>,
DOCUMENT_TITLE: '<?php $this->options->JDocumentTitle() ?>',
LAZY_LOAD: '<?php _getLazyload() ?>',
BIRTHDAY: '<?php $this->options->JBirthDay() ?>',
}
function detectIE(){var n=window.navigator.userAgent,e=n.indexOf("MSIE ");if(e>0){return parseInt(n.substring(e+5,n.indexOf(".",e)),10)}if(n.indexOf("Trident/")>0){var r=n.indexOf("rv:");return parseInt(n.substring(r+3,n.indexOf(".",r)),10)}var i=n.indexOf("Edge/");return i>0&&parseInt(n.substring(i+5,n.indexOf(".",i)),10)};
detectIE() && (alert('当前站点不支持IE浏览器或您开启了兼容模式请使用其他浏览器访问或关闭兼容模式。'), (location.href = 'https://www.baidu.com'))
</script>
<style>
body::before {
background: <?php if (_isMobile()) {
echo $this->options->JWallpaper_Background_WAP ? "url(" . $this->options->JWallpaper_Background_WAP . ")" : "#f5f5f5";
} else {
echo $this->options->JWallpaper_Background_PC ? "url(" . $this->options->JWallpaper_Background_PC . ")" : "#f5f5f5";
} ?>;
background-position: center 0;
background-repeat: no-repeat;
background-size: cover;
}
<?php $this->options->JCustomCSS() ?>
</style>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="renderer" content="webkit" /> <meta name="renderer" content="webkit" />
<meta name="format-detection" content="email=no" /> <meta name="format-detection" content="email=no" />