⬆️ https://github.com/b3log/solo/issues/12711

2019-03-16 19:01:27 +08:00
parent 755eb33471
commit cec3c77491
100 changed files with 110 additions and 1085 deletions
--- a/skins/iMobile/article.ftl
+++ b/skins/iMobile/article.ftl
@@ -59,7 +59,7 @@
 				<img class="avatar itip" id="ava_author" title="${article.authorName}" alt="Seves" lang="发表人 ${article.authorName}" src="${article.authorThumbnailURL}" data- href="/authors/${article.authorId}" />
 			</section>
 		</header>
-		<section class="abstract content-reset">
+		<section class="abstract vditor-reset">
 			${article.articleContent}<#-- 
 			<blockquote><p>本文链接：<a href="${servePath}${article.articlePermalink}">${servePath}${article.articlePermalink}</a></p></blockquote> -->
 			<#if "" != article.articleSign.signHTML?trim>
--- a/skins/iMobile/css/base.css
+++ b/skins/iMobile/css/base.css
--- a/skins/iMobile/css/base.scss
+++ b/skins/iMobile/css/base.scss
@@ -16,7 +16,8 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@charset "utf-8";
-@import "../../../scss/reset-content";
+@import "../../../scss/reset";
+@import "vditor/src/assets/scss/classic";

 /*!Copyright (c) 2010-2016, b3log.org & hacpai.com Licensed under the Apache License, Version 2.0 (the "License");*/

--- a/skins/iMobile/footer.ftl
+++ b/skins/iMobile/footer.ftl
@@ -55,11 +55,12 @@
    $("#stat_copy").attr("lang","\u60a8\u662f\u6765\u81ea "+returnCitySN.cname+" \u7684\u8bbf\u5ba2");
  }
  var today = new Date().getDate();
-  var latkeConfig={"servePath": "${servePath}", "staticServePath": "${staticServePath}", "isLoggedIn": "${isLoggedIn?string}", "userName": "${userName}"};
+  var latkeConfig ={"servePath": "${servePath}", "staticServePath": "${staticServePath}", "isLoggedIn": "${isLoggedIn?string}", "userName": "${userName}"};
  var Label={
-    "skinDirName":"${skinDirName}","em00Label":"${em00Label}","em01Label":"${em01Label}","em03Label":"${em03Label}","em04Label":"${em04Label}",
-    "em05Label":"${em05Label}","em06Label":"${em06Label}","em07Label":"${em07Label}","em08Label":"${em08Label}","em09Label":"${em09Label}",
-    "em10Label":"${em10Label}","em11Label":"${em11Label}","em12Label":"${em12Label}","em13Label":"${em13Label}","em14Label":"${em14Label}"
+    "markedAvailable": ${markedAvailable?c},
+    "hljsStyle": "atom-one-light",
+    "langLabel": "${langLabel}",
+    "skinDirName":"${skinDirName}"
  };
  Util.init()
  <#-- 参数说明：消息、选择器、方向(顶右底左对应1234)、是否固定 -->
--- a/skins/iMobile/js/common.min.js
+++ b/skins/iMobile/js/common.min.js
--- a/skins/iMobile/js/l10n.min.js
+++ b/skins/iMobile/js/l10n.min.js
@@ -1,18 +1 @@
-/*
- * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2019, b3log.org & hacpai.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
 function convertEntities(t){var e,n;if(e=function(t){if(/&[^;]+;/.test(t)){var e=document.createElement("div");return e.innerHTML=t,e.firstChild?e.firstChild.nodeValue:t}return t},"string"==typeof t)return e(t);if("object"==typeof t)for(n in t)"string"==typeof t[n]&&(t[n]=e(t[n]));return t}
--- a/skins/iMobile/js/page.min.js
+++ b/skins/iMobile/js/page.min.js
--- a/skins/iMobile/js/welcome.min.js
+++ b/skins/iMobile/js/welcome.min.js
@@ -1,18 +1 @@
-/*
- * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2019, b3log.org & hacpai.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
 !function(){var o=function(o){layer.msg(o,{time:2e3})},i=function(o){return Cookie.readCookie(o)},n=function(o,i,n){Cookie.createCookie(o,i,n)};750<$("body").width()&&""==i("showTips")&&""==i("isShowTips")&&"/"==top.location.pathname&&navigator.cookieEnabled&&layer.confirm("客官您好，<b> "+$("#logofont").text()+" </b>欢迎您的访问，已默认为您开启图标悬浮提示，是否需要显示悬浮提示？",{btn:["留着吧","消失一周","再想想"],closeBtn:!1,time:9999,title:!1,success:function(o){o.find(".layui-layer-btn .layui-layer-btn0").css({"border-color":"#333","background-color":"#666"})}},function(){n("isShowTips","1",90),o("<b>好嘞~</b>")},function(){n("showTips","0",7),o("<b><i>7</i> 天内访问将不再提示！<b>")},function(){layer.closeAll()})}();
--- a/skins/iMobile/js/yilia7.min.js
+++ b/skins/iMobile/js/yilia7.min.js
@@ -1,18 +1 @@
-/*
- * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-2019, b3log.org & hacpai.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
 var Yilia={init:function(){Util.killIE(),this._initToc(),this.resetTags(),$(window).scroll(function(){0<$("article").length&&0===$("article.post").length&&$("article:not(.show)").each(function(){$(this).offset().top<=$(window).scrollTop()+$(window).height()-$(this).height()/7&&$(this).addClass("show")}),$(window).scrollTop()>$(window).height()?$(".icon-goup").show():$(".icon-goup").hide(),$(document).height()-$("body").height()-300<$(window).scrollTop()?$("#backBtm").hide():$("#backBtm").show(),1===$("article.post").length&&$("article.post").addClass("show")}),$(window).scroll()},_initToc:function(){if(0===$(".b3-solo-list li").length)return!1;$(".side footer").after('<div class="toc"><a href="javascript:$(\'.side .toc\').hide()" class="close">X</a></div>'),$(".side .toc a").after($(".b3-solo-list")),$(".side .toc-btn").show()},resetTags:function(){$("a.tag").each(function(t){$(this).addClass("color"+Math.ceil(4*Math.random()))})},share:function(){$(".share span").click(function(){var t=$(this).data("type"),i=encodeURIComponent($("title").text()),o=$(".post-title a").attr("href")?$(".post-title a").attr("href"):location,e=$(".post-content img:eq(0)").attr("src"),s={};s.qq="http://connect.qq.com/widget/shareqq/index.html?title="+i+"&url="+o,s.tencent="http://share.v.t.qq.com/index.php?c=share&a=index&title="+i+"&url="+o+"&pic="+e,s.weibo="http://v.t.sina.com.cn/share/share.php?title="+i+"&url="+o+"&pic="+e,s.google="https://plus.google.com/share?url="+o,s.twitter="https://twitter.com/intent/tweet?status="+i+" "+o,window.open(s[t],"_blank","top=100,left=200,width=720,height=618")})}};Yilia.init();
--- a/skins/iMobile/macro-comments.ftl
+++ b/skins/iMobile/macro-comments.ftl
@@ -43,7 +43,7 @@
                <a class="fn-right itip" lang="${replyLabel}" id="rep_${comment.oId}" href="javascript:page.toggleEditor('${comment.oId}', '${comment.commentName}')"><span class="iconfont icon-huiche"></span></a>
                </#if>
            </div>
-            <div class="comment-content content-reset">${comment.commentContent}</div>
+            <div class="comment-content vditor-reset">${comment.commentContent}</div>
        </div>
    </li>
    </#list>
--- a/skins/iMobile/page.ftl
+++ b/skins/iMobile/page.ftl
@@ -31,7 +31,7 @@
 <body>
 <#include "side.ftl">
 <main>
-	<article class="post content-reset">
+	<article class="post vditor-reset">
 		<section class="abstract">
 			${page.pageContent}
 		</section>
--- a/skins/iMobile/搜索页面（覆盖至根目录）/css/default-init.css
+++ b/skins/iMobile/搜索页面（覆盖至根目录）/css/default-init.css
@@ -263,139 +263,6 @@ button:active {
 /* end init */

 /* start search */
-.content-reset {
-    font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;
-    word-wrap: break-word;
-    overflow: auto;
-    line-height: 1.5;
-    font-size: 13px;
-    word-break: break-all;
-    color: #545454;
-}
-
-.content-reset ul,
-.content-reset ol {
-    padding-left: 2em;
-    margin-top: 0;
-    margin-bottom: 16px
-}
-.content-reset li {
-    margin-top: 0.25em
-}
-.content-reset h1,
-.content-reset h2,
-.content-reset h3,
-.content-reset h4,
-.content-reset h5,
-.content-reset h6 {
-    margin-top: 24px;
-    margin-bottom: 16px;
-    font-weight: 600;
-    line-height: 1.25
-}
-.content-reset h1 {
-    padding-bottom: 0.3em;
-    font-size: 2em;
-    border-bottom: 1px solid #eee
-}
-.content-reset h2 {
-    padding-bottom: 0.3em;
-    font-size: 1.5em;
-    border-bottom: 1px solid #eee
-}
-.content-reset h3 {
-    font-size: 1.25em
-}
-.content-reset h4 {
-    font-size: 1em
-}
-.content-reset h5 {
-    font-size: 0.875em
-}
-.content-reset h6 {
-    font-size: 0.85em
-}
-.content-reset hr {
-    height: 2px;
-    padding: 0;
-    margin: 5px 0;
-    background-color: #e7e7e7;
-    border: 0
-}
-.content-reset p {
-    margin-top: 0;
-    margin-bottom: 0;
-}
-.content-reset blockquote {
-    padding: 0 1em;
-    color: #777;
-    border-left: 0.25em solid #ddd;
-    margin-bottom: 16px
-}
-.content-reset blockquote p {
-    margin: 0
-}
-.content-reset iframe {
-    border: 1px solid #ccc
-}
-.content-reset table {
-    width: 100%;
-    border: 1px solid #dedede;
-    margin: 15px auto;
-    border-collapse: collapse;
-    empty-cells: show
-}
-.content-reset thead {
-    text-align: center
-}
-.content-reset td,
-.content-reset th {
-    height: 35px;
-    border: 1px solid #dedede;
-    padding: 0 10px
-}
-.content-reset th {
-    font-weight: bold;
-    text-align: center !important;
-    background: rgba(158, 188, 226, 0.2)
-}
-.content-reset tbody tr:nth-child(2n) {
-    background: rgba(158, 188, 226, 0.12)
-}
-.content-reset tr:hover {
-    background: #efefef
-}
-.content-reset code {
-    padding: 0.2em 0.4em;
-    margin: 0;
-    font-size: 85%;
-    background-color: rgba(252, 41, 41, 0.12);
-    border-radius: 3px;
-    color: #d23f31;
-    font-family: mononoki, Consolas, "Liberation Mono", Menlo, Courier, monospace
-}
-.content-reset pre>code {
-    padding: 0.5em;
-    border-radius: 0;
-    color: #333;
-    background-color: rgba(0, 0, 0, 0.04);
-    background-size: 20px 20px;
-    border-radius: 5px
-}
-.content-reset kbd {
-    display: inline-block;
-    padding: 3px 5px;
-    font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace;
-    line-height: 10px;
-    color: #555;
-    vertical-align: middle;
-    background-color: #fcfcfc;
-    border: solid 1px #ccc;
-    border-bottom-color: #bbb;
-    border-radius: 3px;
-    box-shadow: inset 0 -1px 0 #bbb
-}
-
 .search { padding-bottom: 110px; border-top: 5px solid #e6e5d9; }
 .search__header { padding: 15px 20px; position: fixed; top: 0; width: 100%; z-index: 9; background: #efefef; border-bottom: 3px solid #e6e5d9; }
 .search__header a { line-height: 44px; }
--- a/skins/iMobile/搜索页面（覆盖至根目录）/search.ftl
+++ b/skins/iMobile/搜索页面（覆盖至根目录）/search.ftl
@@ -54,7 +54,7 @@
                    &nbsp;<i class="iconfont icon-liulan" title="${viewLabel}"></i> ${article.articleViewCount} 
                </div>
            </header>
-            <div class="content-reset abstract">
+            <div class="vditor-reset abstract">
            ${article.articleAbstract}
            </div>
            <footer class="tags">