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-03-28 22:27:22 +08:00
parent bd2e97857b
commit e97641ca99
10 changed files with 20 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

17
assets/css/joe.global.min.scss
View File

@ -1671,7 +1671,7 @@
transition: transform 0.35s, opacity 0.35s;
}
}
code {
p code {
display: inline-block;
min-height: 26px;
line-height: 26px;
@ -1682,17 +1682,6 @@
color: #e6a23c;
vertical-align: top;
}
pre code {
display: unset;
vertical-align: unset;
min-height: unset;
line-height: unset;
border-radius: unset;
font-size: unset;
background: unset;
padding: unset;
color: unset;
}
pre[class*='language-'] {
position: relative;
margin: 0 0 18px;
@ -1702,9 +1691,7 @@
overflow: hidden;
code[class*='language-'] {
display: block;
white-space: pre-wrap;
word-break: break-all;
word-wrap: break-word;
overflow: auto;
padding: 0 15px 12px;
}
&::after {

6
core/factory.php
View File

@ -42,7 +42,7 @@ class Editor
{
?>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/themes/prism-tomorrow.min.css">
<link rel="stylesheet" href="<?php Helper::options()->themeUrl('typecho/write/css/joe.write.min.css?v=6.1.6') ?>">
<link rel="stylesheet" href="<?php Helper::options()->themeUrl('typecho/write/css/joe.write.min.css?v=6.1.7') ?>">
<script>
window.JoeConfig = {
uploadAPI: '<?php Helper::security()->index('/action/upload'); ?>',
@ -51,8 +51,8 @@ class Editor
}
</script>
<script src="https://cdn.jsdelivr.net/npm/typecho-joe-next@6.0.0/plugin/prism/prism.js"></script>
<script src="<?php Helper::options()->themeUrl('typecho/write/js/joe.parse.min.js?v=6.1.6') ?>"></script>
<script src="<?php Helper::options()->themeUrl('typecho/write/js/joe.write.chunk.js?v=6.1.6') ?>"></script>
<script src="<?php Helper::options()->themeUrl('typecho/write/js/joe.parse.min.js?v=6.1.7') ?>"></script>
<script src="<?php Helper::options()->themeUrl('typecho/write/js/joe.write.chunk.js?v=6.1.7') ?>"></script>
<?php
}
}

2
core/function.php
View File

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

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "typecho-joe-next",
"version": "6.1.6",
"version": "6.1.7",
"description": "A Theme Of Typecho",
"main": "index.php",
"keywords": [

2
public/include.php
View File

@ -18,7 +18,7 @@
<?php endif; ?>
<link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.mode.min.css'); ?>">
<link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.normalize.min.css'); ?>">
<link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.global.min.css'); ?>">
<link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.global.min.css?v=6.1.7'); ?>">
<link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.responsive.min.css'); ?>">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/typecho-joe-next@6.0.0/plugin/qmsg/qmsg.css">
<?php if ($this->options->JAside_Weather_Key) : ?>

2
typecho/write/css/joe.write.min.css vendored
View File

File diff suppressed because one or more lines are too long

16
typecho/write/css/joe.write.min.scss
View File

@ -137,12 +137,13 @@ body.fullscreen {
background-color: rgba(221, 240, 255, 0.2);
}
.cm-content {
width: 100%;
white-space: pre-wrap;
word-break: break-all;
word-wrap: break-word;
overflow-wrap: break-word;
color: #ccc;
caret-color: #ccc;
padding: 15px 13px 15px 11px;
-webkit-user-modify: read-write-plaintext-only;
}
.cm-matchingBracket {
color: #8f938f;
@ -198,8 +199,7 @@ body.fullscreen {
font-size: 14px;
font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
white-space: pre-wrap;
word-break: break-all;
word-wrap: break-word;
overflow-wrap: break-word;
color: #606266;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
@ -382,14 +382,6 @@ body.fullscreen {
background: #ebeef5;
}
}
tbody {
tr {
transition: background 0.35s;
&:hover {
background: #ebeef5;
}
}
}
}
img {
display: block;

6
typecho/write/js/joe.write.chunk.js
View File

File diff suppressed because one or more lines are too long

5
typecho/write/js/joe.write.js
View File

@ -11,7 +11,7 @@ import JoeAction from './_actions';
class Joe extends JoeAction {
constructor() {
super();
this.plugins = [classHighlightStyle, history(), bracketMatching(), closeBrackets()];
this.plugins = [history(), classHighlightStyle, bracketMatching(), closeBrackets()];
this.parser = new HyperDown();
this._isPasting = false;
@ -120,7 +120,8 @@ class Joe extends JoeAction {
});
}
})
]
],
tabSize: 4
})
});
$('.cm-mainer').prepend(cm.dom);