⬆️ 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/Shawn/article.ftl
+++ b/skins/Shawn/article.ftl
@@ -60,7 +60,7 @@
                    </div>
                    <div class="clear"></div>
                    <div class="entry">
-                        <div class="content-reset">
+                        <div class="vditor-reset">
                            ${article.articleContent}
                        </div>
                        <#if "" != article.articleSign.signHTML?trim>
--- a/skins/Shawn/css/base.css
+++ b/skins/Shawn/css/base.css
--- a/skins/Shawn/css/base.scss
+++ b/skins/Shawn/css/base.scss
@@ -15,8 +15,8 @@
 * 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/>.
 */
-
-@import "../../../scss/reset-content";
+@import "../../../scss/reset";
+@import "vditor/src/assets/scss/classic";
 * {margin:0;padding:0;}

 img,
--- a/skins/Shawn/footer.ftl
+++ b/skins/Shawn/footer.ftl
@@ -50,27 +50,14 @@
    };

    var Label = {
+        "markedAvailable": ${markedAvailable?c},
+        "hljsStyle": "atom-one-light",
+        "langLabel": "${langLabel}",
        "clearAllCacheLabel": "${clearAllCacheLabel}",
        "clearCacheLabel": "${clearCacheLabel}",
        "adminLabel": "${adminLabel}",
        "logoutLabel": "${logoutLabel}",
        "skinDirName": "${skinDirName}",
-        "loginLabel": "${loginLabel}",
-        "em00Label": "${em00Label}",
-        "em01Label": "${em01Label}",
-        "em02Label": "${em02Label}",
-        "em03Label": "${em03Label}",
-        "em04Label": "${em04Label}",
-        "em05Label": "${em05Label}",
-        "em06Label": "${em06Label}",
-        "em07Label": "${em07Label}",
-        "em08Label": "${em08Label}",
-        "em09Label": "${em09Label}",
-        "em10Label": "${em10Label}",
-        "em11Label": "${em11Label}",
-        "em12Label": "${em12Label}",
-        "em13Label": "${em13Label}",
-        "em14Label": "${em14Label}"
    };

    $(document).ready(function () {
--- a/skins/Shawn/js/core.min.js
+++ b/skins/Shawn/js/core.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 hidetoolbar(){$("#wgToolBar").slideUp(600,function(){$("#showtoolbar").slideDown(600)})}function showtoolbar(){$("#showtoolbar").slideUp(600,function(){$("#wgToolBar").slideDown(600)})}$("#share ul").css({display:"none",top:"-225px",opacity:"0"}),$(".commentlist li cite a,.outter a").attr("href",function(){var e="{{blog.domain}}".substring(0,7)+"";return this.href.replace(e,"")}),$(".commentlist li cite a[href='http://']").each(function(){$(this).replaceWith("<span style='color:#444;border-bottom:1px dotted #aaa'>"+$(this).text()+"</span>")}),$(document).ready(function(){if($("#header-navi li").each(function(e){if(e<$("#header-navi li").length){var t=$(this),n=window.location.pathname+window.location.search;if(0===e&&"/"===n)return void t.addClass("current_page_item");-1<n.indexOf(t.find("a").attr("href"))&&0!==e&&t.addClass("current_page_item")}}),0<$("input#author:has[value]").length){$("div.friendly").css("display","none"),$(".authorgra").css("display","block");$("div#respond").append('<span style="padding:0 5px;font:bold 10px verdana;color:#888;cursor:pointer;letter-spacing:0" class="infoeditor">(Edit)</span>'),$(".infoeditor").toggle(function(){$(".friendly").fadeIn(),$(".authorgra").css("display","none")},function(){$(".friendly").css("display","none"),$(".authorgra").fadeIn()})}$(".twitter").click(function(){return window.open("http://twitter.com/ansenorg"),!1}),Util.setTopBar()});var showRelatedul=function(e,t,n){var a=$("#relatedul");a.hasClass("hidden")?(""===$("#randomArticles").html()&&(page.loadRandomArticles(),page.loadRelevantArticles(e,t),0!==page.tips.externalRelevantArticlesDisplayCount&&page.loadExternalRelevantArticles(n)),a.slideDown().removeClass("hidden")):a.slideUp().addClass("hidden")},common=new Common;
--- a/skins/Shawn/js/ed.min.js
+++ b/skins/Shawn/js/ed.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 get_check_area(e){1==e?($("#check").load("/checkcode/"),$("#checkarea").show()):2==e&&($("#check").html("<img id='checkimg' src='/checkimg/' style='border:0px;padding:0;float:left;margin-right:8px' title='Click here to change Code' onclick='reloadCheckImage();' />"),$("#checkarea").show())}function reloadCheckImage(){document.getElementById("checkimg").src+="?"}function showinfo(e){window.alert(e)}function add_comment(e){comment=$(e),loadjs?($("#comments").prepend(comment),comment.animate({backgroundColor:"#fbc7c7"},"slow").animate({backgroundColor:"white"},"slow")):($("#comments").prepend(comment).show(),$.getScript("http://dev.jquery.com/view/trunk/plugins/color/jquery.color.js",function(){comment.animate({backgroundColor:"#fbc7c7"},"slow").animate({backgroundColor:"white"},"slow"),loadjs=!0}))}jQuery(document).ready(function(){$(".commentlist li:even").addClass("alt"),$(".commentlist li:odd").addClass("altline"),loadjs=!1});
--- a/skins/Shawn/js/javascription.min.js
+++ b/skins/Shawn/js/javascription.min.js
--- a/skins/Shawn/js/pagenavi.min.js
+++ b/skins/Shawn/js/pagenavi.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 showPageLink(e,a,t,s){var o=0;for(o=Math.max(1,a-1),1==a?(document.write("<span class='pages' style='color:#7D7D7D'>1st</span> "),document.write("<span class='pages' style='color:#7D7D7D'>&laquo;</span> ")):(document.write('<a href="'+e+s+"1\" title='The 1 page'>1st</a> "),document.write('<a href="'+e+o+s+"\" title='Prev page(The "+o+" page)'>&laquo;</a> ")),6<a&&document.write("<span>...</span> "),o=Math.max(1,a-5);o<a;o++)document.write('<a href="'+e+o+s+"\" title='The "+o+" page'>"+o+"</a> ");for(document.write("<font color='red'>"+a+"</font> "),o=a+1;o<=Math.min(t,a+5);o++)document.write('<a href="'+e+o+s+"\" title='The "+o+" page'>"+o+"</a> ");o=Math.min(t,a+1),a+5<t&&document.write("<span>...</span> "),a==t?(document.write("<span class='pages' style='color:#7D7D7D'>&raquo;</span> "),document.write("<span class='pages' style='color:#7D7D7D'>Last</span> ")):(document.write(' <a href="'+e+o+s+"\" title='Next page(The "+o+" page)'>&raquo;</a>"),document.write('<a href="'+e+t+s+"\" title='Last page(The "+t+" page)'>Last</a> "))}
--- a/skins/Shawn/macro-comments.ftl
+++ b/skins/Shawn/macro-comments.ftl
@@ -49,7 +49,7 @@
                    <div class="lovatar">
                        <img src="${comment.commentThumbnailURL}" alt="leehow" class="gravatar" width="48" height="48" />
                    </div>
-                    <div class="list content-reset">
+                    <div class="list vditor-reset">
                        <p>
                            <#if comment.isReply>
                            <a class="replybox" href="#${comment.commentOriginalCommentId}">
--- a/skins/Shawn/page.ftl
+++ b/skins/Shawn/page.ftl
@@ -36,7 +36,7 @@
            <div id="content">
                <div class="post">
                    <div class="entry">
-                        <div class="content-reset">
+                        <div class="vditor-reset">
                            ${page.pageContent}
                        </div>
                        <div id="postail" style="border-top-left-radius: 7px 7px; border-top-right-radius: 7px 7px; border-bottom-right-radius: 7px 7px; border-bottom-left-radius: 7px 7px; position: relative; zoom: 1; ">