Commit c113deb8 authored by Liang Ding's avatar Liang Ding

Merge remote-tracking branch 'origin/dev' into dev

parents d2dad771 98c46095
...@@ -95,7 +95,7 @@ $.extend(Page.prototype, { ...@@ -95,7 +95,7 @@ $.extend(Page.prototype, {
value: shareURL, value: shareURL,
size: 99, size: 99,
}) })
$qrCode.css('background-image', `url(${qr.toDataURL('image/jpeg')})`) $qrCode.css('background-image', `url(${qr.toDataURL('image/jpeg')})`).show()
} else { } else {
$qrCode.slideToggle() $qrCode.slideToggle()
} }
......
This diff is collapsed.
This diff is collapsed.
...@@ -304,6 +304,7 @@ a[class*=" icon-"]:hover { ...@@ -304,6 +304,7 @@ a[class*=" icon-"]:hover {
top: 0; top: 0;
background-color: #32323a; background-color: #32323a;
overflow: auto; overflow: auto;
z-index: 1;
&::-webkit-scrollbar { &::-webkit-scrollbar {
display: none; display: none;
} }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* skin style * skin style
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 0.3.0.1, Feb 9, 2020 * @version 0.3.1.0, Apr 18, 2020
*/ */
@import "../../../scss/reset"; @import "../../../scss/reset";
@import "../../../scss/usite"; @import "../../../scss/usite";
...@@ -491,6 +491,7 @@ a { ...@@ -491,6 +491,7 @@ a {
left: 60px; left: 60px;
height: 99px; height: 99px;
width: 99px; width: 99px;
display: none;
} }
} }
} }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* @fileoverview util and every page should be used. * @fileoverview util and every page should be used.
* *
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 1.0.1.0, Apr 11, 2020 * @version 1.1.0.0, Apr 18, 2020
*/ */
import '../../../js/common' import '../../../js/common'
...@@ -83,6 +83,7 @@ window.Skin = { ...@@ -83,6 +83,7 @@ window.Skin = {
$('.article__top').css('top', 0) $('.article__top').css('top', 0)
} else { } else {
$('.article__top').css('top', -61) $('.article__top').css('top', -61)
$('.article__share .item__qr').hide();
} }
if ($('.article__toc li').length === 0) { if ($('.article__toc li').length === 0) {
......
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