caojiezi2003/Jony
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
haoouba 2021-02-14 20:17:09 +08:00
parent 2d1ecf1e0c
commit dcbe642606
10 changed files with 91 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Joe 5.0.1.zip Normal file
View File

Binary file not shown.

2
assets/css/joe.global.css
View File

File diff suppressed because one or more lines are too long

109
assets/css/joe.global.scss
View File

@ -46,24 +46,6 @@
} }
} }
.joe_mask {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.65);
backdrop-filter: blur(5px);
opacity: 0;
visibility: hidden;
transition: visibility 0.35s, opacity 0.35s;
z-index: 888;
&.active {
visibility: visible;
opacity: 1;
}
}
.joe_header { .joe_header {
position: sticky; position: sticky;
top: 0; top: 0;
@ -72,50 +54,11 @@
box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.1);
&__above { &__above {
position: relative; position: relative;
z-index: 998; z-index: 999;
background: var(--background); background: var(--background);
.joe_container { .joe_container {
align-items: center; align-items: center;
} }
&-slide {
display: none;
position: relative;
width: 20px;
height: 20px;
cursor: pointer;
margin-right: 10px;
.line {
position: absolute;
height: 2px;
width: 20px;
opacity: 1;
left: 0;
top: 0;
transform: rotate(0deg);
background-color: var(--routine);
border-radius: 1px;
transition: top 0.35s ease, transform 0.35s, opacity 0.35s;
&:nth-child(2) {
top: 9px;
}
&:nth-child(3) {
top: 18px;
}
}
&.active {
.line:nth-child(1) {
top: 9px;
transform: rotate(45deg);
}
.line:nth-child(2) {
opacity: 0;
}
.line:nth-child(3) {
top: 9px;
transform: rotate(-45deg);
}
}
}
&-logo { &-logo {
position: relative; position: relative;
display: flex; display: flex;
@ -329,14 +272,17 @@
} }
} }
} }
&-searchicon { &-searchicon,
&-slideicon {
display: none; display: none;
width: 20px; width: 20px;
height: 20px; height: 20px;
fill: var(--routine); fill: var(--routine);
margin-left: auto;
cursor: pointer; cursor: pointer;
} }
&-searchicon {
margin-left: auto;
}
} }
&__below { &__below {
position: relative; position: relative;
@ -400,7 +346,7 @@
top: 60px; top: 60px;
left: 0; left: 0;
right: 0; right: 0;
z-index: 990; z-index: 890;
background: var(--background); background: var(--background);
border-top: 1px solid var(--classC); border-top: 1px solid var(--classC);
transform: translate3d(0, -100%, 0); transform: translate3d(0, -100%, 0);
@ -421,10 +367,11 @@
flex: 1; flex: 1;
height: 36px; height: 36px;
padding: 0 10px; padding: 0 10px;
border: 1px solid var(--classA); border: 1px solid var(--classB);
border-right: none; border-right: none;
border-radius: 2px 0 0 2px; border-radius: 2px 0 0 2px;
color: var(--routine); color: var(--routine);
background: var(--classD);
} }
button { button {
padding: 0 10px; padding: 0 10px;
@ -469,11 +416,11 @@
} }
&__slideout { &__slideout {
position: fixed; position: fixed;
top: 55px; top: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 80%; width: 80%;
z-index: 990; z-index: 1020;
background: var(--classD); background: var(--classD);
transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0);
visibility: hidden; visibility: hidden;
@ -501,7 +448,6 @@
margin-bottom: 15px; margin-bottom: 15px;
background: var(--background); background: var(--background);
border-radius: var(--radius-wrap); border-radius: var(--radius-wrap);
overflow: hidden;
padding: 15px; padding: 15px;
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
.avatar { .avatar {
@ -511,19 +457,22 @@
border-radius: var(--radius-inner); border-radius: var(--radius-inner);
} }
.info { .info {
overflow: hidden;
line-height: 25px;
.link,
.motto {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.link { .link {
display: block; display: block;
line-height: 25px;
font-size: 15px; font-size: 15px;
font-weight: 500; font-weight: 500;
color: var(--main); color: var(--main);
} }
.motto { .motto {
line-height: 25px;
font-size: 12px; font-size: 12px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: var(--routine); color: var(--routine);
} }
} }
@ -572,6 +521,26 @@
} }
} }
} }
&__mask {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.65);
backdrop-filter: blur(5px);
opacity: 0;
visibility: hidden;
transition: visibility 0.35s, opacity 0.35s;
z-index: 880;
&.active {
visibility: visible;
opacity: 1;
}
&.slideout {
z-index: 1010;
}
}
} }
.joe_aside { .joe_aside {

2
assets/css/joe.responsive.css
View File

File diff suppressed because one or more lines are too long

31
assets/css/joe.responsive.scss
View File

@ -117,23 +117,34 @@ html {
} }
} }
@media (max-width: 768px) { @media (max-width: 768px) {
.joe_header__above-nav { .joe_header {
&__above {
.joe_container {
justify-content: space-between;
}
&-nav {
display: none; display: none;
} }
.joe_header__below { &-logo {
display: none;
}
.joe_header__above-logo {
height: 55px; height: 55px;
} margin-right: 0;
.joe_header__above-logo img { img {
max-height: 45px; max-height: 45px;
} }
.joe_header__searchout { }
&-searchicon {
margin-left: 0;
}
&-slideicon {
display: block;
}
}
&__below {
display: none;
}
&__searchout {
top: 55px; top: 55px;
} }
.joe_header__above-slide {
display: block;
} }
.swiper-container { .swiper-container {
height: 180px; height: 180px;

21
assets/js/joe.global.js
View File

@ -350,19 +350,17 @@ document.addEventListener('DOMContentLoaded', () => {
/* 小屏幕伸缩侧边栏 */ /* 小屏幕伸缩侧边栏 */
{ {
$('.joe_header__above-slide').on('click', function () { $('.joe_header__above-slideicon').on('click', function () {
/* 关闭搜索框 */ /* 关闭搜索框 */
$('.joe_header__searchout').removeClass('active') $('.joe_header__searchout').removeClass('active')
/* 处理开启关闭状态 */ /* 处理开启关闭状态 */
if ($('.joe_header__slideout').hasClass('active')) { if ($('.joe_header__slideout').hasClass('active')) {
$('body').css('overflow', '') $('body').css('overflow', '')
$('.joe_mask').removeClass('active') $('.joe_header__mask').removeClass('active slideout')
$('.joe_header__above-slide').removeClass('active')
$('.joe_header__slideout').removeClass('active') $('.joe_header__slideout').removeClass('active')
} else { } else {
$('body').css('overflow', 'hidden') $('body').css('overflow', 'hidden')
$('.joe_mask').addClass('active') $('.joe_header__mask').addClass('active slideout')
$('.joe_header__above-slide').addClass('active')
$('.joe_header__slideout').addClass('active') $('.joe_header__slideout').addClass('active')
} }
}) })
@ -372,16 +370,15 @@ document.addEventListener('DOMContentLoaded', () => {
{ {
$('.joe_header__above-searchicon').on('click', function () { $('.joe_header__above-searchicon').on('click', function () {
/* 关闭侧边栏 */ /* 关闭侧边栏 */
$('.joe_header__above-slide').removeClass('active')
$('.joe_header__slideout').removeClass('active') $('.joe_header__slideout').removeClass('active')
/* 处理开启关闭状态 */ /* 处理开启关闭状态 */
if ($('.joe_header__searchout').hasClass('active')) { if ($('.joe_header__searchout').hasClass('active')) {
$('body').css('overflow', '') $('body').css('overflow', '')
$('.joe_mask').removeClass('active') $('.joe_header__mask').removeClass('active slideout')
$('.joe_header__searchout').removeClass('active') $('.joe_header__searchout').removeClass('active')
} else { } else {
$('body').css('overflow', 'hidden') $('body').css('overflow', 'hidden')
$('.joe_mask').addClass('active') $('.joe_header__mask').addClass('active')
$('.joe_header__searchout').addClass('active') $('.joe_header__searchout').addClass('active')
} }
}) })
@ -389,20 +386,18 @@ document.addEventListener('DOMContentLoaded', () => {
/* 点击遮罩层关闭 */ /* 点击遮罩层关闭 */
{ {
$('.joe_mask').on('click', function () { $('.joe_header__mask').on('click', function () {
$('body').css('overflow', '') $('body').css('overflow', '')
$('.joe_mask').removeClass('active') $('.joe_header__mask').removeClass('active slideout')
$('.joe_header__searchout').removeClass('active') $('.joe_header__searchout').removeClass('active')
$('.joe_header__slideout').removeClass('active') $('.joe_header__slideout').removeClass('active')
$('.joe_header__above-slide').removeClass('active')
}) })
} }
/* 移动端侧边栏 */ /* 移动端侧边栏菜单手风琴 */
{ {
$('.joe_header__slideout-menu .panel').on('click', function () { $('.joe_header__slideout-menu .panel').on('click', function () {
const panelBox = $(this).parent().parent() const panelBox = $(this).parent().parent()
console.log(panelBox);
/* 清除全部内容 */ /* 清除全部内容 */
panelBox.find('.panel').not($(this)).removeClass('in') panelBox.find('.panel').not($(this)).removeClass('in')
panelBox.find('.panel-body').not($(this).siblings('.panel-body')).stop().hide('fast') panelBox.find('.panel-body').not($(this).siblings('.panel-body')).stop().hide('fast')

2
core/function.php
View File

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

13
public/header.php
View File

@ -2,11 +2,9 @@
<div class="joe_header__above"> <div class="joe_header__above">
<div class="joe_container"> <div class="joe_container">
<div class="joe_header__above-slide"> <svg class="joe_header__above-slideicon" viewBox="0 0 1152 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="20" height="20">
<span class="line"></span> <path d="M76.032 872a59.968 59.968 0 1 0 0 120h999.936a59.968 59.968 0 1 0 0-120H76.032z m16-420.032a59.968 59.968 0 1 0 0 120h599.936a59.968 59.968 0 1 0 0-119.936H92.032zM76.032 32a59.968 59.968 0 1 0 0 120h999.936a60.032 60.032 0 0 0 0-120H76.032z" p-id="68770"></path>
<span class="line"></span> </svg>
<span class="line"></span>
</div>
<a title="<?php $this->options->title(); ?>" class="joe_header__above-logo" href="<?php $this->options->siteUrl(); ?>"> <a title="<?php $this->options->title(); ?>" class="joe_header__above-logo" href="<?php $this->options->siteUrl(); ?>">
<img class="lazyload" src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-src="<?php $this->options->JLogo() ?>" onerror="javascript: this.src='data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';" alt="<?php $this->options->title(); ?>" /> <img class="lazyload" src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-src="<?php $this->options->JLogo() ?>" onerror="javascript: this.src='data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';" alt="<?php $this->options->title(); ?>" />
<svg class="profile-color-modes" height="45" viewBox="0 0 106 60" fill="none" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg"> <svg class="profile-color-modes" height="45" viewBox="0 0 106 60" fill="none" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg">
@ -259,7 +257,7 @@
</div> </div>
<div class="joe_header__slideout"> <div class="joe_header__slideout">
<img class="joe_header__slideout-image lazyload" src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-src="<?php $this->options->JAside_Wap_Image() ?>" onerror="javascript: this.src='data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';" alt="<?php $this->author->screenName(); ?>" /> <img class="joe_header__slideout-image" src="<?php $this->options->JAside_Wap_Image() ?>" onerror="javascript: this.src='data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';" alt="<?php $this->author->screenName(); ?>" />
<div class="joe_header__slideout-author"> <div class="joe_header__slideout-author">
<img class="avatar lazyload" src="<?php _getAvatarLazyload(); ?>" data-src="<?php _getAvatarByMail($this->author->mail) ?>" onerror="javascript: this.src = '<?php _getAvatarLazyload(); ?>'" alt="<?php $this->author->screenName(); ?>" /> <img class="avatar lazyload" src="<?php _getAvatarLazyload(); ?>" data-src="<?php _getAvatarByMail($this->author->mail) ?>" onerror="javascript: this.src = '<?php _getAvatarLazyload(); ?>'" alt="<?php $this->author->screenName(); ?>" />
<div class="info"> <div class="info">
@ -347,6 +345,7 @@
<?php endif; ?> <?php endif; ?>
</ul> </ul>
</div> </div>
<div class="joe_header__mask"></div>
</header> </header>
<div class="joe_mask"></div>

6
public/include.php
View File

@ -64,8 +64,8 @@
<!-- 全局公用CSS（静态资源放在了CDN上，如果你的服务器带宽不够，请不要修改成本地，cdn采用jsdelivr放心不会失效） --> <!-- 全局公用CSS（静态资源放在了CDN上，如果你的服务器带宽不够，请不要修改成本地，cdn采用jsdelivr放心不会失效） -->
<link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.mode.css'); ?>"> <link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.mode.css'); ?>">
<link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.normalize.css'); ?>"> <link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.normalize.css'); ?>">
<link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.global.css?v=212'); ?>"> <link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.global.css?v=214'); ?>">
<link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.responsive.css'); ?>"> <link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.responsive.css?v=214'); ?>">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/qmsg/qmsg.css" /> <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/qmsg/qmsg.css" />
<link rel="stylesheet" href="https://apip.weatherdt.com/standard/static/css/weather-standard.css"> <link rel="stylesheet" href="https://apip.weatherdt.com/standard/static/css/weather-standard.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.css" /> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.css" />
@ -78,7 +78,7 @@
<script src="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/sketchpad/joe.sketchpad.js"></script> <script src="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/sketchpad/joe.sketchpad.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/@fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/qmsg/qmsg.js"></script> <script src="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/qmsg/qmsg.js"></script>
<script src="<?php $this->options->themeUrl('assets/js/joe.global.js'); ?>"></script> <script src="<?php $this->options->themeUrl('assets/js/joe.global.js?v=214'); ?>"></script>
<!-- 异步加载的JS --> <!-- 异步加载的JS -->
<script async src="https://apip.weatherdt.com/standard/static/js/weather-standard.js?v=2.0"></script> <script async src="https://apip.weatherdt.com/standard/static/js/weather-standard.js?v=2.0"></script>
<script async src="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/smooth/joe.smooth.js"></script> <script async src="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/smooth/joe.smooth.js"></script>

3
使用必看！！！.txt Normal file
View File

@ -0,0 +1,3 @@
1. 主题开源免费 + 持续更新
2. 将主题上传到Typecho博客usr/themes文件夹后，确保主题文件夹名为：Joe （J是大写的J，不要改成小写）
3. 主题QQ群：198963776（有问题在群内艾特我QQ：2323333339）