Commit 512a6be8 authored by Liyuan Li's avatar Liyuan Li

🐛 后台 footer 遮挡 菜单栏

parent 30211f9e
...@@ -8676,17 +8676,17 @@ ...@@ -8676,17 +8676,17 @@
} }
}, },
"vcmt": { "vcmt": {
"version": "1.1.6", "version": "1.1.10",
"resolved": "https://registry.npmjs.org/vcmt/-/vcmt-1.1.6.tgz", "resolved": "https://registry.npmjs.org/vcmt/-/vcmt-1.1.10.tgz",
"integrity": "sha512-gWD+HZDuFrx7YFVtBBAVqGGh68HrjrV/qQaUOiXfmR1yTO6yeoyQPoAm1vnS4ux8fDDXdu8++yIOFQG9DLAQYA==", "integrity": "sha512-zx04s0R1vYN92zjFhDZbeWi/lapxl3KyeVtV6ccnRIPxYY4yteOFGcw82qTCTvehRjDL+x7zH8BBF5eDw9fv7g==",
"requires": { "requires": {
"jquery": "^3.4.1" "jquery": "^3.4.1"
} }
}, },
"vditor": { "vditor": {
"version": "3.1.12", "version": "3.1.20",
"resolved": "https://registry.npmjs.org/vditor/-/vditor-3.1.12.tgz", "resolved": "https://registry.npmjs.org/vditor/-/vditor-3.1.20.tgz",
"integrity": "sha512-PuGnHtC3hDM8vxGWv01+jzCLT+sC4UeeGyDtQNtUJbj8TrFmqTKKVlM8NLfeGx80nHan+xByrNF4FxntUGuAfw==", "integrity": "sha512-M1z9xIcjpP2mHyKJ9+a+5GaKXx0cNPyf58yMoJOJBSljGLVO3YNkMhqHUMfoZWiz9Ohf7DZTc4LctYPeGFsl5w==",
"requires": { "requires": {
"diff-match-patch": "^1.0.4" "diff-match-patch": "^1.0.4"
} }
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
"jquery": "^3.4.1", "jquery": "^3.4.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"uvstat": "^1.0.7", "uvstat": "^1.0.7",
"vcmt": "^1.1.6", "vcmt": "^1.1.10",
"vditor": "^3.1.12" "vditor": "^3.1.20"
} }
} }
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<#if isLoggedIn && commentable> <#if isLoggedIn && commentable>
<div style="position: fixed;bottom: -300px;width: 100%;opacity: 0;background-color: #f1f7fe;padding: 20px 0;transition: all .15s ease-in-out;z-index: 100;left: 0;" <div style="position: fixed;bottom: -300px;width: 100%;opacity: 0;background-color: #f1f7fe;padding: 20px 0;transition: all .15s ease-in-out;z-index: 100;left: 0;"
id="soloEditor"> id="soloEditor">
<div style="max-width: 768px;margin: 0 auto;padding: 0 10px;"> <div style="max-width: 920px;margin: 0 auto;padding: 0 10px;">
<div id="soloEditorComment"></div> <div id="soloEditorComment"></div>
<div style="display: flex;margin-top: 10px;line-height: 30px"> <div style="display: flex;margin-top: 10px;line-height: 30px">
<div style="flex: 1;" id="soloEditorReplyTarget"></div> <div style="flex: 1;" id="soloEditorReplyTarget"></div>
......
This diff is collapsed.
...@@ -116,10 +116,20 @@ $.extend(SoloEditor.prototype, { ...@@ -116,10 +116,20 @@ $.extend(SoloEditor.prototype, {
'emoji', 'emoji',
'link', 'link',
'upload', 'upload',
'insert-after',
'edit-mode', 'edit-mode',
'preview', 'code-theme',
'fullscreen', 'content-theme',
{
name: 'more',
toolbar: [
'insert-after',
'fullscreen',
'preview',
'format',
'info',
'help',
],
},
] ]
options.resize.enable = false options.resize.enable = false
options.toolbarConfig.pin = true options.toolbarConfig.pin = true
......
...@@ -23,7 +23,7 @@ window.Vcomment = Vcomment ...@@ -23,7 +23,7 @@ window.Vcomment = Vcomment
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 2.2.0.1, Feb 23, 2020 * @version 2.2.0.2, Apr 30, 2020
*/ */
/** /**
...@@ -303,7 +303,7 @@ window.Util = { ...@@ -303,7 +303,7 @@ window.Util = {
loadVditor: function (cb) { loadVditor: function (cb) {
$.ajax({ $.ajax({
method: 'GET', method: 'GET',
url: 'https://cdn.jsdelivr.net/npm/vditor@3.1.12/dist/index.min.js', url: 'https://cdn.jsdelivr.net/npm/vditor@3.1.20/dist/index.min.js',
dataType: 'script', dataType: 'script',
cache: true, cache: true,
success: () => { success: () => {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 2.8.0.0, Apr 16, 2020 * @version 2.8.0.1, Apr 30, 2020
*/ */
window.Page = function (tips) { window.Page = function (tips) {
this.currentCommentId = '' this.currentCommentId = ''
...@@ -95,7 +95,8 @@ $.extend(Page.prototype, { ...@@ -95,7 +95,8 @@ $.extend(Page.prototype, {
value: shareURL, value: shareURL,
size: 99, size: 99,
}) })
$qrCode.css('background-image', `url(${qr.toDataURL('image/jpeg')})`).show() $qrCode.css('background-image', `url(${qr.toDataURL('image/jpeg')})`).
show()
} else { } else {
$qrCode.slideToggle() $qrCode.slideToggle()
} }
...@@ -132,6 +133,7 @@ $.extend(Page.prototype, { ...@@ -132,6 +133,7 @@ $.extend(Page.prototype, {
if (!$('#soloEditorComment').hasClass('vditor')) { if (!$('#soloEditorComment').hasClass('vditor')) {
var that = this var that = this
var resizeEnable = true
var toolbar = [ var toolbar = [
'emoji', 'emoji',
'headings', 'headings',
...@@ -153,29 +155,44 @@ $.extend(Page.prototype, { ...@@ -153,29 +155,44 @@ $.extend(Page.prototype, {
'table', 'table',
'insert-before', 'insert-before',
'insert-after', 'insert-after',
'|',
'undo', 'undo',
'redo', 'redo',
'|', '|',
'edit-mode',
'both',
'preview',
'format',
'|',
'fullscreen', 'fullscreen',
'devtools', 'edit-mode',
'info', {
'help', name: 'more',
], resizeEnable = true toolbar: [
'both',
'code-theme',
'content-theme',
'export',
'outline',
'preview',
'format',
'devtools',
'info',
'help',
],
}]
if ($(window).width() < 768) { if ($(window).width() < 768) {
toolbar = [ toolbar = [
'emoji', 'emoji',
'link', 'link',
'upload',
'insert-after',
'edit-mode', 'edit-mode',
'preview', 'code-theme',
'fullscreen', 'content-theme',
{
name: 'more',
toolbar: [
'insert-after',
'fullscreen',
'preview',
'format',
'info',
'help',
],
},
] ]
resizeEnable = false resizeEnable = false
} }
...@@ -214,7 +231,7 @@ $.extend(Page.prototype, { ...@@ -214,7 +231,7 @@ $.extend(Page.prototype, {
position: 'top', position: 'top',
}, },
lang: Label.langLabel, lang: Label.langLabel,
toolbar: toolbar, toolbar,
after: () => { after: () => {
vditor.focus() vditor.focus()
}, },
......
This diff is collapsed.
This diff is collapsed.
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 3.3.0.2, Feb 9, 2020 * @version 3.3.1.0, Apr 30, 2020
*/ */
@import "reset"; @import "reset";
@import "function"; @import "function";
...@@ -960,6 +960,10 @@ button#submitArticle:hover { ...@@ -960,6 +960,10 @@ button#submitArticle:hover {
border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px;
} }
.solo-kanbanniang {
z-index: 1;
}
@media (max-width: 768px) { @media (max-width: 768px) {
#top > a { #top > a {
display: none; display: none;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment