From 810fa4fe758fe5060876d34626050dcadaeb153b Mon Sep 17 00:00:00 2001
From: yangjian <zmister@qq.com>
Date: Thu, 26 Nov 2020 20:58:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86html=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/app_doc/check_viewcode.html        |   1 -
 template/app_doc/create_base_2.html         |  93 +----------------
 template/app_doc/create_base_vditor.html    | 104 +-------------------
 template/app_doc/create_doc.html            |   2 +-
 template/app_doc/create_doc_vditor.html     |   2 +-
 template/app_doc/docs_base.html             |  93 +----------------
 template/app_doc/head_base.html             |   7 +-
 template/app_doc/manage_base.html           |   1 -
 template/app_doc/manage_project_import.html |   1 -
 template/app_doc/pro_list.html              |   2 +-
 10 files changed, 9 insertions(+), 297 deletions(-)

diff --git a/template/app_doc/check_viewcode.html b/template/app_doc/check_viewcode.html
index ae3fc69..20e57f4 100644
--- a/template/app_doc/check_viewcode.html
+++ b/template/app_doc/check_viewcode.html
@@ -10,7 +10,6 @@
     <link rel="icon" href="{% static 'favicon_16.png' %}"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 	<title>请输入访问码 - {% if site_name != None and site_name != '' %}{{site_name}} {% else %}站点标题{% endif %}</title>
-	<meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
 	<link rel="stylesheet" href="{% static 'layui/css/layui.css' %}" crossorigin="anonymous">
     <style>
diff --git a/template/app_doc/create_base_2.html b/template/app_doc/create_base_2.html
index fad0a7b..dd8b6cd 100644
--- a/template/app_doc/create_base_2.html
+++ b/template/app_doc/create_base_2.html
@@ -15,100 +15,9 @@
     <link rel="stylesheet" href="{% static 'katex/katex.min.css' %}?version={{mrdoc_version}}" />
     <link rel="icon" href="{% static 'favicon_16.png' %}"/>
     <link href="{% static 'mrdoc/mrdoc.css' %}?version={{mrdoc_version}}" rel="stylesheet">
+    <link href="{% static 'mrdoc/mrdoc-editor.css' %}?version={{mrdoc_version}}" rel="stylesheet">
     <link href="{% static 'tagsInput/tagsinput.css' %}" rel="stylesheet" type="text/css"/>
     <style>
-        /* 编辑器图标样式 */
-        .editormd-menu i{
-            color: #333;
-            font-size: 16px;
-        }
-        ul.editormd-menu{
-            margin-bottom: 0;
-        }
-        /* 编辑器预览列表样式 */
-        .markdown-body ul li{
-            list-style:disc;
-        }
-        .markdown-body ul > li > ul > li{
-            list-style-type: circle;
-        }
-        .markdown-body ol li{
-            list-style-type: decimal;
-        }
-        .markdown-body ol ol ul,.markdown-body ol ul ul,.markdown-body ul ol ul,.markdown-body ul ul ul li{
-            list-style-type: square;
-        }
-        /* 选择上级文档样式 */
-        .selected-parent-doc{
-            text-decoration-line: underline;
-            font-weight: 700;
-            color: black;
-        }
-        /* 选择图片 - 图片列表样式 */
-        .select-img-list{
-            cursor: pointer;
-            position: relative;
-            display:flex;
-            float: left;
-            align-items:center;
-            width: 120px;
-            height:120px;
-            margin: 0 20px 30px 0;
-            text-align: center;
-            overflow: hidden;
-        }
-        .select-img-list:hover{
-            background-color: #EAFFEA;
-        }
-        .select-img-list-i{
-            display: block;
-            width: 100%;
-            height: auto;
-            -webkit-background-size: contain;
-            border: 1px solid transparent;
-            border-radius: 3px;
-            overflow: hidden;
-        }
-        /* HTML预览样式 */
-        .markdown-body h1{
-            font-size: 1.7em;
-        }
-        .markdown-body h2{
-            font-size: 1.5em;
-        }
-        .markdown-body h3{
-            font-size: 1.25em;
-        }
-        .markdown-body h4{
-            font-size: 1em;
-        }
-        .markdown-body h5{
-            font-size: .875em;
-        }
-        .markdown-body h6{
-            font-size: .85em;
-        }
-        /* 编辑器行号宽度 */
-        .CodeMirror-linenumber{
-            width: auto !important;
-        }
-        li.L1, li.L3, li.L5, li.L7, li.L9 {
-            background: none !important;
-        }
-        /* layui 折叠面板 边框颜色 - 用在左侧文集结构 */
-        .layui-badge-rim, .layui-colla-content, .layui-colla-item, .layui-collapse, .layui-elem-field, .layui-form-pane .layui-form-item[pane], .layui-form-pane .layui-form-label, .layui-input, .layui-layedit, .layui-layedit-tool, .layui-quote-nm, .layui-select, .layui-tab-bar, .layui-tab-card, .layui-tab-title, .layui-tab-title .layui-this:after, .layui-textarea{
-            border-color: #f8f8f8;
-        }
-        .layui-colla-content{
-            padding: 0px;
-        }
-        /* 预览代码宽度 */
-        ol.linenums li{
-            width: max-content;
-        }
-        #doc-tree{
-            margin-bottom: 5px;
-        }
     </style>
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
diff --git a/template/app_doc/create_base_vditor.html b/template/app_doc/create_base_vditor.html
index 7bef9ca..908a46b 100644
--- a/template/app_doc/create_base_vditor.html
+++ b/template/app_doc/create_base_vditor.html
@@ -15,112 +15,10 @@
     <link rel="stylesheet" href="{% static 'vditor/dist/index.css' %}?version={{mrdoc_version}}" />
     <link rel="icon" href="{% static 'favicon_16.png' %}"/>
     <link href="{% static 'mrdoc/mrdoc.css' %}?version={{mrdoc_version}}" rel="stylesheet">
+    <link href="{% static 'mrdoc/mrdoc-editor.css' %}?version={{mrdoc_version}}" rel="stylesheet">
     <link href="{% static 'tagsInput/tagsinput.css' %}" rel="stylesheet" type="text/css"/>
     <style>
-        /* 编辑器图标样式 */
-        .editormd-menu i{
-            color: #333;
-            font-size: 16px;
-        }
-        ul.editormd-menu{
-            margin-bottom: 0;
-        }
-        /* 编辑器预览列表样式 */
-        .markdown-body ul li{
-            list-style:disc;
-        }
-        .markdown-body ul > li > ul > li{
-            list-style-type: circle;
-        }
-        .markdown-body ol li{
-            list-style-type: decimal;
-        }
-        .markdown-body ol ol ul,.markdown-body ol ul ul,.markdown-body ul ol ul,.markdown-body ul ul ul li{
-            list-style-type: square;
-        }
-        /* 选择上级文档样式 */
-        .selected-parent-doc{
-            text-decoration-line: underline;
-            font-weight: 700;
-            color: black;
-        }
-        /* 选择图片 - 图片列表样式 */
-        .select-img-list{
-            cursor: pointer;
-            position: relative;
-            display:flex;
-            float: left;
-            align-items:center;
-            width: 120px;
-            height:120px;
-            margin: 0 20px 30px 0;
-            text-align: center;
-            overflow: hidden;
-        }
 
-        .select-img-list:hover{
-            background-color: #EAFFEA;
-        }
-        .select-img-list-i{
-            display: block;
-            width: 100%;
-            height: auto;
-            -webkit-background-size: contain;
-            border: 1px solid transparent;
-            border-radius: 3px;
-            overflow: hidden;
-        }
-        /* layui分页组件样式 */
-        .layui-laypage .layui-laypage-curr .layui-laypage-em{
-            background-color: #2176ff !important;
-        }
-        .layui-form-select dl dd.layui-this{
-            background-color: #2176ff !important;
-        }
-        /* layui单选样式 */
-        .layui-form-radio>i:hover, .layui-form-radioed>i{
-            color: #2176ff;
-        }
-        /* HTML预览样式 */
-        .markdown-body h1{
-            font-size: 1.7em;
-        }
-        .markdown-body h2{
-            font-size: 1.5em;
-        }
-        .markdown-body h3{
-            font-size: 1.25em;
-        }
-        .markdown-body h4{
-            font-size: 1em;
-        }
-        .markdown-body h5{
-            font-size: .875em;
-        }
-        .markdown-body h6{
-            font-size: .85em;
-        }
-        /* 编辑器行号宽度 */
-        .CodeMirror-linenumber{
-            width: auto !important;
-        }
-        li.L1, li.L3, li.L5, li.L7, li.L9 {
-            background: none !important;
-        }
-        /* layui 折叠面板 边框颜色 - 用在左侧文集结构 */
-        .layui-badge-rim, .layui-colla-content, .layui-colla-item, .layui-collapse, .layui-elem-field, .layui-form-pane .layui-form-item[pane], .layui-form-pane .layui-form-label, .layui-input, .layui-layedit, .layui-layedit-tool, .layui-quote-nm, .layui-select, .layui-tab-bar, .layui-tab-card, .layui-tab-title, .layui-tab-title .layui-this:after, .layui-textarea{
-            border-color: #f8f8f8;
-        }
-        .layui-colla-content{
-            padding: 0px;
-        }
-        /* 预览代码宽度 */
-        ol.linenums li{
-            width: max-content;
-        }
-        #doc-tree{
-            margin-bottom: 5px;
-        }
     </style>
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
diff --git a/template/app_doc/create_doc.html b/template/app_doc/create_doc.html
index ed4cf52..b4018cb 100644
--- a/template/app_doc/create_doc.html
+++ b/template/app_doc/create_doc.html
@@ -88,7 +88,7 @@
         <div class="layui-collapse" style="margin-top: 10px;margin-bottom: 10px;">
             <div class="layui-colla-item">
                 <h2 class="layui-colla-title">标签</h2>
-                <div class="layui-colla-content layui-show">
+                <div class="layui-colla-content">
                     <div class="layui-row layui-col-space5" style="padding: 5px;background-color: #fff;">
                         <input name="tagsinput" id="tagsinputval" class="tagsinput" data-role="tagsinput" value="" placeholder="输入标签名">
                     </div>
diff --git a/template/app_doc/create_doc_vditor.html b/template/app_doc/create_doc_vditor.html
index 883f78b..9264551 100644
--- a/template/app_doc/create_doc_vditor.html
+++ b/template/app_doc/create_doc_vditor.html
@@ -87,7 +87,7 @@
         <div class="layui-collapse" style="margin-top: 10px;margin-bottom: 10px;">
             <div class="layui-colla-item">
                 <h2 class="layui-colla-title">标签</h2>
-                <div class="layui-colla-content layui-show">
+                <div class="layui-colla-content">
                     <div class="layui-row layui-col-space5" style="padding: 5px;background-color: #fff;">
                         <input name="tagsinput" id="tagsinputval" class="tagsinput" data-role="tagsinput" value="" placeholder="输入标签名">
                     </div>
diff --git a/template/app_doc/docs_base.html b/template/app_doc/docs_base.html
index d7df395..5646fb0 100644
--- a/template/app_doc/docs_base.html
+++ b/template/app_doc/docs_base.html
@@ -21,99 +21,8 @@
     <link href="{% static 'viewerjs/viewer.min.css' %}?version={{mrdoc_version}}" rel="stylesheet">
     <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">
     <style>
-        /*一级无序li显示实心圆点*/
-        .doc-content ul li{
-            list-style:disc;
-        }
-        /*二级无序li显示空心圆点*/
-        .doc-content ul > li > ul > li{
-            list-style-type: circle;
-        }
-        /*有序li显示数字*/
-        .doc-content ol li{
-            list-style-type: decimal;
-        }
-        .doc-content ol ol ul,.doc-content ol ul ul,.doc-content ul ol ul,.doc-content ul ul ul {
-            list-style-type: square;
-        }
-        /* 三级及以下无序li显示小方块 */
-        .doc-content ul ul ul li{
-            list-style-type: square;
-        }
-        /* 下拉目录隐藏li样式 */
-        .editormd-toc-menu ul.markdown-toc-list li{
-            /*list-style:none;*/
-        }
-        /* 弹出框文档目录样式 */
-        ul.markdown-toc-list{
-            list-style-position:inside;
-        }
-        ul.markdown-toc-list li{
-            list-style: none!important;
-            line-height: 24px;
-        }
-        ul.markdown-toc-list > li > ul > li,ul.markdown-toc-list > li > ul li{
-            padding-left:15px;
-        }
-        ul.markdown-toc-list a{
-            /* text-decoration: underline!important; */
-        }
-        /* 块级代码和行内代码去除边框 */
-        .markdown-body p code{
-            border:none;
-        }
-        /* HTML预览样式 */
-        .markdown-body h1{ 
-            font-size: 1.7em;
-        }
-        .markdown-body h2{
-            font-size: 1.5em;
-        }
-        .markdown-body h3{
-            font-size: 1.25em;
-        }
-        .markdown-body h4{
-            font-size: 1em;
-        }
-        .markdown-body h5{
-            font-size: .875em;
-        }
-        .markdown-body h6{
-            font-size: .85em;
-        }
-        {% if img_scale %}
-        .markdown-body p img{
-            max-width: 350px;
-        }
-        {% endif %}
-        #url_qrcode img{
-            margin: auto;
-        }
-        /* 文档代码块样式 */
-        ol.linenums li{ 
-            width: max-content;
-        }
-        pre.linenums{
-            max-height: 500px;
-        }
-        li.L1, li.L3, li.L5, li.L7, li.L9 {
-            background: none !important;
-        }
-
-        /* layui弹出框颜色 */
-        .layui-tab-brief>.layui-tab-more li.layui-this:after, .layui-tab-brief>.layui-tab-title .layui-this:after{
-            border-bottom: 2px solid #333;
-        }
-        .layui-tab-brief>.layui-tab-title .layui-this{
-            color: #333;
-        }
-        /* 覆盖vditor样式 */
-        .vditor-outline__item{
-            padding: 0;
-            padding-bottom: 5px;
-            color: #333;
-        }
     </style>
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
diff --git a/template/app_doc/head_base.html b/template/app_doc/head_base.html
index 726678c..38a4f5f 100644
--- a/template/app_doc/head_base.html
+++ b/template/app_doc/head_base.html
@@ -1,18 +1,17 @@
-{% load staticfiles %}
+{% load static %}
 <div class="layui-header layui-fluid">
     <div class="" style="display:flex;flex-direction:row;justify-content:space-between;">
         <!-- LOGO -->
         <div class="">
             <a class="logo" href="{% url 'pro_list' %}">
                 <img src="{% static 'logo.jpg' %}" style="height: 32px;width: auto;">
-                <!-- <h1><strong>MrDoc</strong></h1> -->
             </a>
         </div>
         <!-- 搜索框 -->
         <div style="margin:12px;" class="layui-hide-xs">
-            <form method="get" action="{% url 'search' %}" target="_blank">
+            <form method="get" action="{% url 'doc_search' %}" target="_blank">
             <div class="layui-input-inline">
-                <input class="layui-input mrdoc-search-input" placeholder="搜索文集或文档" name="kw"/>
+                <input class="layui-input mrdoc-search-input" placeholder="搜索文档" name="q"/>
                 <button type="submit" style="position: absolute;top:12px;right: 8px;border: none;background-color: white;">
                     <i class="layui-icon layui-icon-search" ></i>
                 </button>
diff --git a/template/app_doc/manage_base.html b/template/app_doc/manage_base.html
index 450af46..0b5991c 100644
--- a/template/app_doc/manage_base.html
+++ b/template/app_doc/manage_base.html
@@ -11,7 +11,6 @@
     {% block custom_link %}
     {% endblock %}
     <style>
-        
     </style>
 </head>
 <body class="layui-layout-body">
diff --git a/template/app_doc/manage_project_import.html b/template/app_doc/manage_project_import.html
index 32bde32..4a8d161 100644
--- a/template/app_doc/manage_project_import.html
+++ b/template/app_doc/manage_project_import.html
@@ -7,7 +7,6 @@
         <div class="layui-card-header" style="margin-bottom: 10px;">
         <span style="font-size:18px;">导入文集到MrDoc</span>
         </div>
-        <div class="layui-row" >
             <button class="layui-btn layui-btn-normal layui-btn-sm" id="upload-zip"><i class="layui-icon layui-icon-upload"></i>导入Markdown压缩包（.Zip）</button>
         </div>
     </div>
diff --git a/template/app_doc/pro_list.html b/template/app_doc/pro_list.html
index 00b191c..42c2663 100644
--- a/template/app_doc/pro_list.html
+++ b/template/app_doc/pro_list.html
@@ -67,7 +67,7 @@
             }
 
         }
-        
+
     </style>
 </head>
 <body class="layui-container">