Skip to content

Commit 3264b43

Browse files
MuZhou233MuZhou233
committed
new version
1 parent e4caecb commit 3264b43

18 files changed

+347
-214
lines changed

‎_includes/footer.php‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,34 @@
44
<div>&copy; <?php echo date('Y'); echo ' '; $this->options->owner(); ?> · Powered by Typecho · Theme by <a href="https://github.com/muzhou233/Morecho-Typecho">Morecho</a></div>
55
<?php endif ?>
66
</div>
7-
<script src="<?php $this->get_libUrl('asserts/lib/jquery-3.4.1.slim.min.js', 'https://cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.slim.min.js'); ?>"></script>
8-
<script src="<?php $this->get_libUrl('asserts/lib/js.cookie.min.js', 'https://cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js'); ?>"></script>
9-
<script src="<?php $this->get_libUrl('asserts/lib/bootstrap/popper.min.js', 'asserts/lib/bootstrap/popper.min.js'); ?>"></script>
10-
<script src="<?php $this->get_libUrl('asserts/lib/bootstrap/bootstrap.min.js', 'https://cdn.jsdelivr.net/npm/bootstrap@4.4.1/dist/js/bootstrap.min.js'); ?>"></script>
11-
<script src="<?php $this->get_libUrl('asserts/lib/feather.min.js'); ?>"></script>
7+
<script src="<?php echo get_libUrl('asserts/lib/jquery-3.4.1.slim.min.js', 'https://cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.slim.min.js'); ?>"></script>
8+
<script src="<?php echo get_libUrl('asserts/lib/js.cookie.min.js', 'https://cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js'); ?>"></script>
9+
<link rel="stylesheet" href="<?php echo get_libUrl('asserts/lib/tooltipster/tooltipster.bundle.min.css', 'https://cdn.jsdelivr.net/npm/tool-tip@4.2.5/dist/css/tooltipster.bundle.min.css'); ?>"></link>
10+
<link rel="stylesheet" href="<?php echo get_libUrl('asserts/lib/tooltipster/theme/tooltipster-sideTip-punk.min.css', 'https://cdn.jsdelivr.net/npm/tool-tip@4.2.5/dist/css/plugins/tooltipster/sideTip/themes/tooltipster-sideTip-punk.min.css'); ?>"></link>
11+
<script src="<?php echo get_libUrl('asserts/lib/tooltipster/tooltipster.bundle.min.js', 'https://cdn.jsdelivr.net/npm/tool-tip@4.2.5/dist/js/tooltipster.bundle.min.js'); ?>"></script>
12+
<script src="<?php echo get_libUrl('asserts/lib/feather.min.js'); ?>"></script>
1213
<script>
1314
feather.replace();
1415
</script>
15-
<script src="<?php $this->get_libUrl('asserts/lib/highlight/highlight.min.js', 'https://cdn.jsdelivr.net/npm/highlight.js@9.18.1/lib/index.min.js'); ?>"></script>
16-
<script src="<?php $this->get_libUrl('asserts/lib/SmoothScroll.min.js', 'asserts/lib/SmoothScroll.min.js'); ?>"></script>
17-
<script src="<?php $this->get_libUrl('asserts/lib/Autolinker.min.js', 'https://cdn.jsdelivr.net/npm/autolinker@3.13.0/dist/Autolinker.min.js'); ?>"></script>
18-
<script src="<?php $this->get_libUrl('asserts/lib/pangu.min.js', 'https://cdn.jsdelivr.net/npm/pangu@4.0.7/dist/browser/pangu.min.js'); ?>"></script>
16+
<script src="<?php echo get_libUrl('asserts/lib/SmoothScroll.min.js'); ?>"></script>
17+
<script src="<?php echo get_libUrl('asserts/lib/pangu.min.js', 'https://cdn.jsdelivr.net/npm/pangu@4.0.7/dist/browser/pangu.min.js'); ?>"></script>
1918
<script>
2019
document.addEventListener('DOMContentLoaded', () => {
2120
pangu.autoSpacingPage();
2221
});
2322
</script>
2423

2524
<?php if (($this->is('post')||$this->is('page')) && (!array_key_exists('is_archive', $GLOBALS) || !$GLOBALS['is_archive'])): ?>
26-
<script src="<?php $this->get_libUrl('asserts/lib/clipboard.min.js', 'https://cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js'); ?>"></script>
27-
<script src="<?php $this->get_libUrl('asserts/lib/tocbot.min.js', 'https://cdn.jsdelivr.net/npm/tocbot@4.12.0/dist/tocbot.min.js'); ?>"></script>
25+
<script src="<?php echo get_libUrl('asserts/lib/clipboard.min.js', 'https://cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js'); ?>"></script>
26+
<script src="<?php echo get_libUrl('asserts/lib/tocbot.min.js', 'https://cdn.jsdelivr.net/npm/tocbot@4.12.0/dist/tocbot.min.js'); ?>"></script>
2827
<?php endif ?>
2928

3029
<?php if(($this->is('page') || $this->is('post')) && $this->fields->textIndent === 'true'): ?>
3130
<script>$(function(){$('article p > br').after('<span style="margin-left: 2em;"></span>');});</script>
3231
<style>article p{text-indent: 2em;}</style>
3332
<?php endif; ?>
3433

35-
<script src="<?php $this->get_libUrl('asserts/lib/lazyload.min.js', 'https://cdn.jsdelivr.net/npm/lazyload@2.0.0-rc.2/lazyload.min.js'); ?>"></script>
34+
<script src="<?php echo get_libUrl('asserts/lib/lazyload.min.js', 'https://cdn.jsdelivr.net/npm/lazyload@2.0.0-rc.2/lazyload.min.js'); ?>"></script>
3635
<script src="<?php $this->options->themeUrl('asserts/js/article.js'); ?>"></script>
3736
<link rel="stylesheet" href="<?php $this->options->themeUrl('asserts/lib/highlight/vscode.css'); ?>">
3837
<script src="<?php $this->options->themeUrl('script.js'); ?>"></script>
@@ -58,7 +57,7 @@
5857
</style>
5958
<?php endif; ?>
6059
<?php if($this->options->musicUrl): ?>
61-
<script src="<?php $this->get_libUrl('asserts/lib/plyr/plyr.min.js', 'https://cdn.jsdelivr.net/npm/plyr@3.6.3/dist/plyr.min.js'); ?>"></script>
60+
<script src="<?php echo get_libUrl('asserts/lib/plyr/plyr.min.js', 'https://cdn.jsdelivr.net/npm/plyr@3.6.3/dist/plyr.min.js'); ?>"></script>
6261
<script>
6362
const player = new Plyr('#player', { controls: '',loadSprite: false });
6463
/*

‎_layouts/default-0.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<meta name="description" content="<?php $this->options->description(); ?>" />
1818
<meta name="keywords" content="<?php $this->options->keywords(); ?>" />
1919
<link rel="shortcut icon" href="<?php if($this->options->favicon)$this->options->favicon(); ?>">
20-
<link rel="stylesheet" href="<?php $this->get_libUrl('asserts/lib/bootstrap/bootstrap.min.css', 'https://cdn.jsdelivr.net/npm/bootstrap@4.4.1/dist/css/bootstrap.min.css'); ?>">
20+
<link rel="stylesheet" href="<?php echo get_libUrl('asserts/lib/bootstrap/bootstrap.min.css', 'https://cdn.jsdelivr.net/npm/bootstrap@4.4.1/dist/css/bootstrap.min.css'); ?>">
2121
<link rel="stylesheet" href="<?php $this->options->themeUrl('style.css'); ?>">
2222
<?php $this->header(); ?>
2323
</head>

‎asserts/css/article.css‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,23 @@ code.hljs::-webkit-scrollbar-track {
111111
background-color: transparent;
112112
}
113113
article pre.hljs {
114-
border-radius: 0.5rem;
114+
max-width: unset;
115+
width: calc(100% + 1rem);
116+
left: -1rem;
117+
border-top-right-radius: .5rem;
118+
border-bottom-right-radius: .5rem;
115119
position: relative;
116120
padding: 0;
121+
overflow: unset;
122+
}
123+
article pre.hljs:after {
124+
content: "";
125+
position: absolute;
126+
height: 100%;
127+
width: .25rem;
128+
background-color: #1e1e1e;
129+
left: -.25rem;
130+
top: 0;
117131
}
118132
article pre.hljs-line-numbered code {
119133
margin-left: 3em;
@@ -258,14 +272,16 @@ article blockquote.info:after {
258272
article blockquote.card-meta {
259273
display: flex;
260274
justify-content: space-between;
275+
flex-direction: row-reverse;
261276
align-items: center;
262277
overflow: hidden;
263278
font-size: 0.9rem;
264279
padding: 0 1rem;
265-
border-radius: .5rem;
266-
margin-left: 0;
280+
border-bottom-right-radius: .5rem;
281+
border-top-right-radius: .5rem;
282+
margin-left: -.25rem;
267283
left: -1rem;
268-
width: calc(100% + 2rem);
284+
width: calc(100% + 2rem + .25rem);
269285
}
270286
article#wmd-preview blockquote.card-meta{
271287
padding: 0 !important;
@@ -284,18 +300,14 @@ article blockquote.card-meta .card-meta-background {
284300
background-size: cover;
285301
background-position: 50%;
286302
}
287-
article blockquote.card-meta > *:last-child {
288-
max-width: 0%;
303+
article blockquote.card-meta > *:first-child {
289304
z-index: 1;
290305
}
291-
article blockquote.card-meta > *:first-child {
306+
article blockquote.card-meta > *:last-child {
292307
max-width: unset;
293308
padding: 1rem;
294309
z-index: 1;
295310
}
296-
article blockquote.card-meta:before {
297-
display: none;
298-
}
299311
article blockquote.card-meta h1,
300312
article blockquote.card-meta h2,
301313
article blockquote.card-meta h3,
@@ -311,6 +323,11 @@ article blockquote.card-meta h5:before {
311323
display: none;
312324
}
313325
article blockquote.card-meta img{
326+
max-width: 30%;
314327
border-top-right-radius: .5rem;
315328
border-bottom-right-radius: .5rem;
329+
}
330+
331+
.tooltipster-sidetip.tooltipster-punk.tooltipster-punk-customized .tooltipster-box {
332+
font-size: .9rem;
316333
}

0 commit comments

Comments
 (0)