Skip to content

Commit 9dee0a3

Browse files
eastonmaneastonman
committed
Merge branch 'develop'
2 parents 4d2e058 + 327cb63 commit 9dee0a3

32 files changed

+60
-65
lines changed

‎img/icon/favicon.ico ‎img/favicon.ico

File renamed without changes.

‎img/icon/android-icon-144x144.png

-43.3 KB
Binary file not shown.

‎img/icon/android-icon-192x192.png

-76.9 KB
Binary file not shown.

‎img/icon/android-icon-36x36.png

-4.13 KB
Binary file not shown.

‎img/icon/android-icon-48x48.png

-6.45 KB
Binary file not shown.

‎img/icon/android-icon-72x72.png

-12.6 KB
Binary file not shown.

‎img/icon/android-icon-96x96.png

-20.8 KB
Binary file not shown.

‎img/icon/apple-icon-114x114.png

-28.3 KB
Binary file not shown.

‎img/icon/apple-icon-120x120.png

-31 KB
Binary file not shown.

‎img/icon/apple-icon-144x144.png

-43.3 KB
Binary file not shown.

‎img/icon/apple-icon-152x152.png

-47.7 KB
Binary file not shown.

‎img/icon/apple-icon-180x180.png

-65.1 KB
Binary file not shown.

‎img/icon/apple-icon-57x57.png

-8.49 KB
Binary file not shown.

‎img/icon/apple-icon-60x60.png

-9.21 KB
Binary file not shown.

‎img/icon/apple-icon-72x72.png

-12.6 KB
Binary file not shown.

‎img/icon/apple-icon-76x76.png

-13.8 KB
Binary file not shown.

‎img/icon/apple-icon-precomposed.png

-77.6 KB
Binary file not shown.

‎img/icon/apple-icon.png

-77.6 KB
Binary file not shown.

‎img/icon/browserconfig.xml

-2
This file was deleted.

‎img/icon/favicon-16x16.png

-1.77 KB
Binary file not shown.

‎img/icon/favicon-32x32.png

-3.5 KB
Binary file not shown.

‎img/icon/favicon-96x96.png

-20.8 KB
Binary file not shown.

‎img/icon/ms-icon-144x144.png

-43.3 KB
Binary file not shown.

‎img/icon/ms-icon-150x150.png

-46.5 KB
Binary file not shown.

‎img/icon/ms-icon-310x310.png

-158 KB
Binary file not shown.

‎img/icon/ms-icon-70x70.png

-12 KB
Binary file not shown.

‎inc/footer.php

+19-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
</main>
3-
<div class="mdui-container-fluid pjax-load bottom-mod">
3+
<div class="mdui-container-fluid pjax-load bottom-mod" id="bottom">
44
<!--Footer-->
55
<footer class="mdui-row mdui-shadow-2 mdui-color-white bottom">
66

@@ -96,29 +96,42 @@
9696

9797
</div>
9898

99+
<a class="mdui-fab mdui-fab-mini mdui-fab-fixed mdui-color-theme-accent mdui-ripple mdui-fab-hide" id="scrolltop" href="#header" data-scroll>
100+
<i class="mdui-icon material-icons">expand_less</i>
101+
</a>
99102

100103

101104

102105

103106

104107

105-
106-
<script src="//cdn.jsdelivr.net/npm/[email protected]/dist/js/mdui.min.js"></script>
108+
<script src="//cdn.jsdelivr.net/npm/[email protected]/dist/js/mdui.min.js"></script>
107109
<script type="text/javascript">
108110
// Using MDUI JQ
109111
var $$ = mdui.JQ;
110112
</script>
111113

112114
<script src="<?php $this->options->themeUrl('js/search.js') ?>" type="text/javascript"></script>
115+
113116
<script type="text/javascript">
114117
//Search JS
115118
searchJQ();
116119
</script>
117120

121+
<script src="<?php $this->options->themeUrl('js/scrolltop.js') ?>" type="text/javascript"></script>
122+
123+
124+
<script src="https://cdn.jsdelivr.net/gh/cferdinandi/smooth-scroll@15/dist/smooth-scroll.polyfills.min.js"></script>
125+
<script>
126+
var scroll = new SmoothScroll('[data-scroll]');
127+
</script>
128+
118129
<script src="//cdn.jsdelivr.net/gh/highlightjs/[email protected]/build/highlight.min.js"></script>
119130
<script>hljs.initHighlightingOnLoad();</script>
120131

121-
<script src="//cdn.jsdelivr.net/npm/[email protected]/pjax.min.js"></script>
132+
<?php if (in_array('PJAX', $this->options->FunctionSwitch)): ?>
133+
<script src="//cdn.jsdelivr.net/npm/[email protected]/pjax.min.js"></script>
134+
<?php endif; ?>
122135

123136
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/[email protected]/nprogress.min.css">
124137
<script src="//cdn.jsdelivr.net/npm/[email protected]/nprogress.min.js"></script>
@@ -142,6 +155,7 @@
142155
</script>
143156
<?php endif; ?>
144157

158+
<?php if (in_array('PJAX', $this->options->FunctionSwitch)): ?>
145159
<!--PJAX Js Event-->
146160
<script>
147161
var pjax = new Pjax({
@@ -172,6 +186,7 @@ function() {
172186
});
173187
document.addEventListener('pjax:success', function() {NProgress.done(); } );
174188
</script>
189+
<?php endif; ?>
175190

176191

177192
</body>

‎inc/functions/themeOptions.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ function themeConfig($form)
4949
'LazyLoad' => _t('LazyLoad'),
5050
'ViewCount' => _t('无插件访客统计'),
5151
'ShowMainPic' => _t('显示主页的欢迎图'),
52-
'DarkTheme' => _t('暗色主题')
52+
'DarkTheme' => _t('暗色主题'),
53+
'ScrollTop' => _t('回到顶部按钮'),
54+
'PJAX' => _t('PJAX无刷新加载')
5355
),
5456

5557
//Default choose

‎inc/header.php

+7-41
Original file line numberDiff line numberDiff line change
@@ -11,46 +11,8 @@
1111
<head>
1212
<meta charset="utf-8" />
1313
<meta http-equiv="X-UA-Compatible" />
14-
<meta name="description" content=" " />
1514
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
1615
<meta name="theme-color" content="<?php $this->options->ChromeThemeColor(); ?>" />
17-
18-
<!-- All Icons On ios and browsers -->
19-
<?php if (!empty($this->options->IconUrl)): ?>
20-
<link rel="apple-touch-icon" sizes="57x57" href="<?php $this->options->IconUrl(); ?>/img/icon/apple-icon-57x57.png ">
21-
<link rel="apple-touch-icon" sizes="60x60" href="<?php $this->options->IconUrl(); ?>/img/icon/apple-icon-60x60.png ">
22-
<link rel="apple-touch-icon" sizes="72x72" href="<?php $this->options->IconUrl(); ?>/img/icon/apple-icon-72x72.png ">
23-
<link rel="apple-touch-icon" sizes="76x76" href="<?php $this->options->IconUrl(); ?>/img/icon/apple-icon-76x76.png ">
24-
<link rel="apple-touch-icon" sizes="114x114" href="<?php $this->options->IconUrl(); ?>/img/icon/apple-icon-114x114.png ">
25-
<link rel="apple-touch-icon" sizes="120x120" href="<?php $this->options->IconUrl(); ?>/img/icon/apple-icon-120x120.png ">
26-
<link rel="apple-touch-icon" sizes="144x144" href="<?php $this->options->IconUrl(); ?>/img/icon/apple-icon-144x144.png ">
27-
<link rel="apple-touch-icon" sizes="152x152" href="<?php $this->options->IconUrl(); ?>/img/icon/apple-icon-152x152.png ">
28-
<link rel="apple-touch-icon" sizes="180x180" href="<?php $this->options->IconUrl(); ?>/img/icon/apple-icon-180x180.png ">
29-
<link rel="icon" type="image/png" sizes="192x192" href="<?php $this->options->IconUrl(); ?>/img/icon/android-icon-192x192.png ">
30-
<link rel="icon" type="image/png" sizes="32x32" href="<?php $this->options->IconUrl(); ?>/img/icon/favicon-32x32.png ">
31-
<link rel="icon" type="image/png" sizes="96x96" href="<?php $this->options->IconUrl(); ?>/img/icon/favicon-96x96.png ">
32-
<link rel="icon" type="image/png" sizes="16x16" href="<?php $this->options->IconUrl(); ?>/img/icon/favicon-16x16.png ">
33-
<meta name="msapplication-TileColor" content="#ffffff">
34-
<meta name="msapplication-TileImage" content="<?php $this->options->IconUrl(); ?>/img/icon/ms-icon-144x144.png ">
35-
36-
<?php else: ?>
37-
38-
<link rel="apple-touch-icon" sizes="57x57" href="<?php $this->options->themeUrl('img/icon/apple-icon-57x57.png') ?>">
39-
<link rel="apple-touch-icon" sizes="60x60" href="<?php $this->options->themeUrl('img/icon/apple-icon-60x60.png') ?>">
40-
<link rel="apple-touch-icon" sizes="72x72" href="<?php $this->options->themeUrl('img/icon/apple-icon-72x72.png') ?>">
41-
<link rel="apple-touch-icon" sizes="76x76" href="<?php $this->options->themeUrl('img/icon/apple-icon-76x76.png') ?>">
42-
<link rel="apple-touch-icon" sizes="114x114" href="<?php $this->options->themeUrl('img/icon/apple-icon-114x114.png') ?>">
43-
<link rel="apple-touch-icon" sizes="120x120" href="<?php $this->options->themeUrl('img/icon/apple-icon-120x120.png') ?>">
44-
<link rel="apple-touch-icon" sizes="144x144" href="<?php $this->options->themeUrl('img/icon/apple-icon-144x144.png') ?>">
45-
<link rel="apple-touch-icon" sizes="152x152" href="<?php $this->options->themeUrl('img/icon/apple-icon-152x152.png') ?>">
46-
<link rel="apple-touch-icon" sizes="180x180" href="<?php $this->options->themeUrl('img/icon/apple-icon-180x180.png') ?>">
47-
<link rel="icon" type="image/png" sizes="192x192" href="<?php $this->options->themeUrl('img/icon/android-icon-192x192.png') ?>">
48-
<link rel="icon" type="image/png" sizes="32x32" href="<?php $this->options->themeUrl('img/icon/favicon-32x32.png') ?>">
49-
<link rel="icon" type="image/png" sizes="96x96" href="<?php $this->options->themeUrl('img/icon/favicon-96x96.png') ?>">
50-
<link rel="icon" type="image/png" sizes="16x16" href="<?php $this->options->themeUrl('img/icon/favicon-16x16.png') ?>">
51-
<meta name="msapplication-TileColor" content="#ffffff">
52-
<meta name="msapplication-TileImage" content="<?php $this->options->themeUrl('img/icon/ms-icon-144x144.png') ?>">
53-
<?php endif; ?>
5416
<!-- META END -->
5517

5618
<!--Website Title-->
@@ -60,8 +22,12 @@
6022
</title>
6123
<!--Website Title End-->
6224

63-
<!--Traditional Type of favicon Settings-->
64-
<link rel="icon" type="image/ico" href="<?php $this->options->favicon(); ?>">
25+
<!-- Favicon Settings -->
26+
<?php if (empty($this->options->IconUrl)): ?>
27+
<link rel="icon" href="<?php $this->options->themeUrl('img/favicon.ico'); ?>">
28+
<?php else: ?>
29+
<link rel="icon" type="image/ico" href="<?php $this->options->IconUrl(); ?>">
30+
<?php endif; ?>
6531
<!--Favicon Settings End-->
6632

6733
<!--Using Default SEO Info Output By Typecho Itself-->
@@ -80,7 +46,7 @@
8046

8147
<!-- MDUI css-->
8248

83-
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/[email protected].1/dist/css/mdui.min.css" />
49+
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/[email protected].2/dist/css/mdui.min.css" />
8450
<link href="//cdn.jsdelivr.net/gh/highlightjs/[email protected]/build/styles/gruvbox-dark.min.css" rel="stylesheet">
8551

8652
<!--EXTERNAL CSS END-->

‎inc/sidebar.php

+11-15
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
<!-- Sidebar brand image -->
2121
<div class="sidebar-image mdui-valign">
2222
<?php if (!empty($this->options->avatarURL)): ?>
23-
<img src="<?php $this->options->avatarURL() ?>">
23+
<img alt="Avatar" src="<?php $this->options->avatarURL() ?>">
2424
<?php else: ?>
2525
<?php if (!empty($this->options->Logo)): ?>
26-
<img src="<?php $this->options->Logo() ?>">
26+
<img alt="Avatar" src="<?php $this->options->Logo() ?>">
2727
<?php else: ?>
2828
<?php if (!empty($this->options->CDNURL)): ?>
29-
<img src="<?php $this->options->CDNURL() ?>/MaterialCDN/img/Avatar.jpg">
29+
<img alt="Avatar" src="<?php $this->options->CDNURL() ?>/MaterialCDN/img/Avatar.jpg">
3030
<?php else: ?>
31-
<img src="<?php $this->options->themeUrl('img/Avatar.jpg') ?>">
31+
<img alt="Avatar" src="<?php $this->options->themeUrl('img/Avatar.jpg') ?>">
3232

3333
<?php endif; ?>
3434
<?php endif; ?>
@@ -118,15 +118,15 @@
118118
<!--Archive Dropdown Begin-->
119119
<div class="mdui-collapse" mdui-collapse="{ accordion: true}">
120120
<div class="mdui-collapse-item">
121-
<li class="mdui-collapse-item-header mdui-list-item">
121+
<div class="mdui-collapse-item-header mdui-list-item">
122122

123123
<i class="mdui-list-item-icon mdui-icon material-icons mdui-text-color-theme-text">inbox</i>
124124
<div class="mdui-list-item-content mdui-text-color-theme-text" >
125125
<?php echo $MultiLang->get('Archive'); ?>
126126
</div>
127127
<i class="mdui-collapse-item-arrow mdui-list-item-icon mdui-icon material-icons mdui-ripple mdui-text-color-theme-text" >keyboard_arrow_down</i>
128128

129-
</li>
129+
</div>
130130

131131
<div class="mdui-collapse-item-body">
132132
<ul class="mdui-list mdui-list-dense">
@@ -148,15 +148,15 @@
148148
<!--Category Dropdown Begin-->
149149
<div class="mdui-collapse" mdui-collapse="{ accordion: true}">
150150
<div class="mdui-collapse-item">
151-
<li class="mdui-collapse-item-header mdui-list-item">
151+
<div class="mdui-collapse-item-header mdui-list-item">
152152

153153
<i class="mdui-list-item-icon mdui-icon material-icons mdui-text-color-theme-text">apps</i>
154154
<div class="mdui-list-item-content mdui-text-color-theme-text" >
155155
<?php echo $MultiLang->get('Categories'); ?>
156156
</div>
157157
<i class="mdui-collapse-item-arrow mdui-list-item-icon mdui-icon material-icons mdui-text-color-theme-text mdui-ripple" >keyboard_arrow_down</i>
158158

159-
</li>
159+
</div>
160160

161161
<div class="mdui-collapse-item-body">
162162
<ul class="mdui-list mdui-list-dense" for="show-category-button">
@@ -174,7 +174,7 @@
174174
</div>
175175
<!--Category Dropdown End -->
176176

177-
<li class="mdui-divider"></li>
177+
<div class="mdui-divider"></div>
178178

179179
<!-- Show Pages -->
180180
<?php $this->widget('Widget_Contents_Page_List')->to($pages); ?>
@@ -186,10 +186,6 @@
186186
</a>
187187
<?php endwhile; ?>
188188

189-
<?php if (!defined('__TYPECHO_ROOT_DIR__')) {exit;}
190-
Typecho_Widget::widget('Widget_Stat')->to($stat);
191-
?>
192-
193189
<!-- Status Page -->
194190
<?php if (!($this->options->Status == '')): ?>
195191
<li class="mdui-list-item">
@@ -199,7 +195,7 @@
199195
</li>
200196
<?php endif; ?>
201197

202-
<li class="mdui-divider"></li>
198+
<div class="mdui-divider"></div>
203199
</div>
204200

205201
<!-- Article Numebr -->
@@ -239,4 +235,4 @@
239235
<?php endif; ?>
240236

241237

242-
</div>
238+
</div>

‎index.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<main>
4848

4949
<!-- Auto Hiding Header & Appbar & Title BEGIN -->
50-
<header class="mdui-appbar mdui-appbar-fixed mdui-appbar-scroll-hide header-responsive" >
50+
<header class="mdui-appbar mdui-appbar-fixed mdui-appbar-scroll-hide header-responsive" id="header">
5151
<div class="mdui-toolbar mdui-color-theme mdui-color-white" >
5252

5353
<!-- menu icon -->
@@ -297,7 +297,7 @@
297297

298298

299299
<!--Right Part Of Md Card Header(Under) -->
300-
<div class="mdui-typo mdui-float-right index-post-card-header-rightinfo" id="Post-category-comment" style="color:<?php $this->options->alinkcolor(); ?>">
300+
<div class="mdui-typo mdui-float-right index-post-card-header-rightinfo" style="color:<?php $this->options->alinkcolor(); ?>">
301301

302302
<div class="mdui-text-color-pink-accent" >
303303
<?php $this->category(', '); ?>

‎js/scrolltop.js

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
window.onload = function() {
2+
var fab = document.getElementById('scrolltop');
3+
var clientHeight = document.documentElement.clientHeight;
4+
var timer = null;
5+
var isTop = true;
6+
window.onscroll = function () {
7+
var scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
8+
if ( scrollTop >= clientHeight) {
9+
fab.classList.remove('mdui-fab-hide');
10+
} else {
11+
fab.classList.add('mdui-fab-hide');
12+
}
13+
if (!isTop) {
14+
clearInterval(timer);
15+
}
16+
isTop = false;
17+
}
18+
}

0 commit comments

Comments
 (0)