优化图标字体，优化文集大纲样式

static/editor.md/editormd.js

@@ -552,7 +552,7 @@
                 // _this.loadedDisplay();
             });
 
-            editormd.loadCSS(loadPath + "codemirror/codemirror.min");
+            editormd.loadCSS(loadPath + "codemirror/lib/codemirror");
             
             if (settings.searchReplace && !settings.readOnly)
             {
@@ -565,7 +565,7 @@
                 editormd.loadCSS(loadPath + "codemirror/addon/fold/foldgutter");            
             }
             
-            editormd.loadScript(loadPath + "codemirror/codemirror.min", function() {
+            editormd.loadScript(loadPath + "codemirror/lib/codemirror", function() {
                 editormd.$CodeMirror = CodeMirror;
                 
                 editormd.loadScript(loadPath + "codemirror/modes.min", function() {

static/iconFont/demo_index.html

@@ -30,6 +30,12 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe645;</span>
+                <div class="name">文档</div>
+                <div class="code-name">&amp;#xe645;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe603;</span>
                 <div class="name">鸟瞰logo</div>
@@ -344,6 +350,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont mrdoc-icon-wendang"></span>
+            <div class="name">
+              文档
+            </div>
+            <div class="code-name">.mrdoc-icon-wendang
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont mrdoc-icon-pro-44"></span>
             <div class="name">
@@ -769,6 +784,14 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#mrdoc-icon-wendang"></use>
+                </svg>
+                <div class="name">文档</div>
+                <div class="code-name">#mrdoc-icon-wendang</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#mrdoc-icon-pro-44"></use>

static/iconFont/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "mrdoc-icon-",
   "description": "用于觅道文档的文集文档图标",
   "glyphs": [
+    {
+      "icon_id": "8389369",
+      "name": "文档",
+      "font_class": "wendang",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
     {
       "icon_id": "2353251",
       "name": "鸟瞰logo",

static/iconFont/iconfont.svg

@@ -20,6 +20,9 @@ Created by iconfont
   />
     <missing-glyph />
     
+    <glyph glyph-name="wendang" unicode="&#58949;" d="M410.055 738.532h198.201c22.983 0 42.325 22.983 42.325 49.607s-19.342 49.607-43.463 49.607h-196.95c-24.234 0-43.576-22.983-43.576-49.607s19.342-49.607 43.463-49.607z m310.727-484.125H295.253c-15.701 0-29.013-13.312-29.013-29.013s13.312-29.014 29.013-29.014H721.92c15.701 0 29.013 13.312 29.013 29.014-1.137 16.839-14.45 29.013-30.15 29.013z m0 170.667H295.253c-15.701 0-29.013-13.312-29.013-29.014s13.312-29.013 29.013-29.013H721.92c15.701 0 29.013 13.312 29.013 29.013-1.137 16.84-14.45 29.014-30.15 29.014zM266.24 553.3c0-15.701 13.312-29.013 29.013-29.013H721.92c15.701 0 29.013 13.312 29.013 29.013s-13.312 29.014-29.013 29.014H295.253c-15.701 0.113-29.013-13.199-29.013-29.014zM821.02 809.984h-56.775c-15.701 0-33.905-9.671-33.905-25.372s18.09-31.517 33.905-31.517h56.775c33.792 0 56.776-22.983 56.776-56.889v-654.79c0-33.907-22.984-56.89-56.776-56.89H209.465c-33.906 0-71.339 22.983-71.339 56.89v654.79c0 33.906 22.983 56.89 56.775 56.89h71.339c15.701 0 21.732 15.7 21.732 31.516s-6.03 25.372-21.732 25.372h-71.339c-79.758 0-113.664-49.607-113.664-115.03v-647.622c0-70.201 42.326-119.808 119.695-119.808H814.99c77.37 0 119.694 41.187 119.694 119.808V694.955c0 65.422-39.936 115.029-113.664 115.029z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="pro-44" unicode="&#58883;" d="M124.046331 788.240006c14.806345 0 58.446099 2.532664 79.681515 1.168922a175.338296 175.338296 0 1 1 41.49673 24.742181 116.892197 116.892197 0 0 0-26.885206-2.532664c-21.235416 0-73.836905-1.558563-81.434897-2.337844a127.802136 127.802136 0 0 0-60.589122 5.64979A108.904564 108.904564 0 0 0 58.00224 823.307665c-7.208352 4.870508-10.130657 6.03943-14.416704 2.337844s-7.597993-12.663321-2.337844-15.585626 6.429071-2.337844 9.351375-4.675688A85.526124 85.526124 0 0 1 77.484273 792.526053a160.921591 160.921591 0 0 1 46.562058-4.286047z m181.182906-33.703917a100.72211 100.72211 0 1 0-100.72211-100.72211 100.72211 100.72211 0 0 0 100.72211 100.72211zM506.088996 562.638065l-64.680349-68.771576a7.403172 7.403172 0 0 1 0-10.325477l69.940498-69.940498 69.940498 69.940498a7.403172 7.403172 0 0 1 0 10.325477l-64.680349 68.771576a7.403172 7.403172 0 0 1-10.325478 0zM156.776147 199.492972A1039.366453 1039.366453 0 0 0 91.121696 436.199672a5.84461 5.84461 0 0 1-7.792813 1.753383c-5.64979-2.143024-3.311946-43.250113 0-96.436063S113.331213 67.40479000000005 231.002692-78.12599599999999c0 0 5.64979-8.961735 11.104758 2.337844 3.117125 6.234251 14.221884 28.833409 24.547362 48.315442a107.930462 107.930462 0 0 1 14.806345 31.950533 642.907085 642.907085 0 0 0-124.68501 195.015149zM437.31742 819.800899c51.432567-37.210683 65.45963-76.174749 74.616186-76.174749s23.183619 38.964066 74.616186 76.174749a258.526576 258.526576 0 0 0 86.889866 40.717449c6.623891 1.753383 13.637423 4.480868 13.637423 4.480867A487.050822 487.050822 0 0 1 511.933606 895.975647a487.050822 487.050822 0 0 1-175.338296-30.781611s7.013532-2.727485 13.637423-4.480868a258.526576 258.526576 0 0 0 87.084687-40.912269zM312.82723 579.782254A74.421366 74.421366 0 1 1 231.197512 662.191253a74.616186 74.616186 0 0 1 81.629718-82.408999zM940.343508 437.953055a5.84461 5.84461 0 0 1-7.792813-1.753383 1039.366453 1039.366453 0 0 0-65.654451-236.511879 642.907085 642.907085 0 0 0-124.49019-194.820329 107.930462 107.930462 0 0 1 14.806345-31.950534c10.130657-19.482033 21.430236-42.081191 24.547362-48.315441 5.454969-11.104759 11.104759-2.337844 11.104759-2.337844 116.892197 145.530786 145.141145 366.457038 148.063449 419.642988s5.260149 93.903398-0.584461 96.046422zM980.086855 825.645509c-4.286047 3.701586-7.208352 2.532664-14.806345-2.337844a108.904564 108.904564 0 0 0-17.92347-8.572095 127.802136 127.802136 0 0 0-60.589122-5.649789c-7.597993 0-60.199482 2.727485-81.434897 2.337844A116.892197 116.892197 0 0 0 778.837456 813.956289a177.286499 177.286499 0 1 1 41.49673-24.742182c21.625056 1.363742 64.875169 0 79.681514-1.168922a160.921591 160.921591 0 0 1 47.34134 4.286048A85.526124 85.526124 0 0 1 973.657785 805.384195c2.922305 2.532664 4.286047 1.948203 9.351375 4.675688s1.363742 11.88404-2.922305 15.585626zM718.443154 553.091869a100.72211 100.72211 0 1 0 100.72211 100.72211 100.72211 100.72211 0 0 0-100.72211-100.72211zM726.041147 727.8457040000001A74.421366 74.421366 0 1 1 792.474879 662.191253a74.421366 74.421366 0 0 1-66.433732 65.654451zM904.886209 572.573902a211.769697 211.769697 0 0 0-265.734929-116.892197 40.132988 40.132988 0 0 1-41.88637-9.351376l-85.331304-85.136484-85.331304 85.331304a40.132988 40.132988 0 0 1-41.886371 9.351376 211.769697 211.769697 0 0 0-265.734928 116.892197v-21.625056A782.008799 782.008799 0 0 1 511.933606-128a782.008799 782.008799 0 0 1 393.342243 678.948845c0 7.208352-0.19482 13.832243-0.38964 21.625057zM664.672743 284.43463599999995l-56.692715-190.339461a17.92347 17.92347 0 0 0-17.144189-12.663322h-19.482033a17.92347 17.92347 0 0 0-17.144189 12.858142l-40.327808 142.998121v2.143024-1.948203l-43.834574-143.387762a17.72865 17.72865 0 0 0-16.949369-12.663322h-19.482032a17.72865 17.72865 0 0 0-16.949369 12.663322l-57.082356 190.339461a17.72865 17.72865 0 0 0 16.949368 22.988799h11.104759a17.72865 17.72865 0 0 0 17.144189-13.247783l40.717449-151.375395v1.363742l44.029394 150.985755a17.92347 17.92347 0 0 0 17.144189 12.858142h14.806345a17.92347 17.92347 0 0 0 17.144189-13.052962l42.860472-151.765036v-1.363743 1.363743l38.964066 151.375395a17.72865 17.72865 0 0 0 17.144189 13.247782h8.377274a17.72865 17.72865 0 0 0 17.144189-22.793978z"  horiz-adv-x="1024" />
 
     

template/app_doc/docs_base.html

@@ -22,6 +22,7 @@
     <link rel="icon" href="{% static 'search/mrdoc_logo_300.png' %}" sizes="192x192" />
     <link href="{% static 'mrdoc/mrdoc.css' %}?version={{mrdoc_version}}" rel="stylesheet">
     <link href="{% static 'mrdoc/mrdoc-docs.css' %}?version={{mrdoc_version}}" rel="stylesheet">
+    <link href="{% static 'iconFont/iconfont.css' %}?version={{mrdoc_version}}" rel="stylesheet">
     <style>
         {% if img_scale %}
         .markdown-body p img{
@@ -88,7 +89,7 @@
                 <li>
                     {% if docs.children %}
                         <div style="display:flex;justify-content:space-between;">
-                            <a href="{% url 'doc' pro_id=pro_id doc_id=docs.id %}" title="{{docs.name}}">{{ docs.name }}</a>
+                            <a href="{% url 'doc' pro_id=pro_id doc_id=docs.id %}" title="{{docs.name}}"><i class="iconfont mrdoc-icon-wendang"></i> {{ docs.name }}</a>
                             {% if docs.open_children %}
                                 <i class="layui-icon layui-icon-down switch-toc"></i>
                             {% else %}
@@ -106,7 +107,7 @@
                             <li>
                                 {% if node.id|get_next_doc %}
                                     <div style="display:flex;justify-content:space-between;">
-                                        <a href="{% url 'doc' pro_id=pro_id doc_id=node.id %}" title="{{node.name}}">{{ node.name }}</a>
+                                        <a href="{% url 'doc' pro_id=pro_id doc_id=node.id %}" title="{{node.name}}"><i class="iconfont mrdoc-icon-wendang"></i> {{ node.name }}</a>
                                         {% if node.open_children %}
                                             <i class="layui-icon layui-icon-down switch-toc"></i>
                                         {% else %}
@@ -121,17 +122,17 @@
 
                                     <!-- 三级目录 -->
                                     {% for doc in node.children %}
-                                        <li><a href="{% url 'doc' pro_id=pro_id doc_id=doc.id %}" title="{{doc.name}}">{{ doc.name }}</a></li>
+                                        <li><a href="{% url 'doc' pro_id=pro_id doc_id=doc.id %}" title="{{doc.name}}"><i class="iconfont mrdoc-icon-wendang"></i> {{ doc.name }}</a></li>
                                     {% endfor %}
                                     </ul>
                                 {% else %}
-                                    <a href="{% url 'doc' pro_id=pro_id doc_id=node.id %}" title="{{node.name}}">{{ node.name }}</a>
+                                    <a href="{% url 'doc' pro_id=pro_id doc_id=node.id %}" title="{{node.name}}"><i class="iconfont mrdoc-icon-wendang"></i> {{ node.name }}</a>
                                 {% endif %}
                             </li>
                         {% endfor %}
                         </ul>
                     {% else %}
-                        <a href="{% url 'doc' pro_id=pro_id doc_id=docs.id %}" title="{{docs.name}}">{{ docs.name }}</a>
+                        <a href="{% url 'doc' pro_id=pro_id doc_id=docs.id %}" title="{{docs.name}}"><i class="iconfont mrdoc-icon-wendang"></i> {{ docs.name }}</a>
                     {% endif %}
                 </li>
             {% endfor %}

template/app_doc/tag_doc_base.html

@@ -62,7 +62,7 @@
             <!-- 一级目录 -->
             {% for doc in docs %}
                 <li tooltip="{{doc.doc.top_doc | get_doc_top}}" placement="bottom">
-                    <a href="{% url 'tag_doc' tag_id=tag.id doc_id=doc.doc.id %}" target="_blank" >{{ doc.doc.name }}</a>
+                    <a href="{% url 'tag_doc' tag_id=tag.id doc_id=doc.doc.id %}" target="_blank" ><i class="iconfont mrdoc-icon-wendang"></i> {{ doc.doc.name }}</a>
                 </li>
             {% endfor %}
             </ul>