From 0a1fb6d9833a617a25fd970a8ea323e7172599eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com>
Date: Tue, 13 Dec 2022 11:16:10 +0800
Subject: [PATCH] =?UTF-8?q?commonHeader=E7=A7=BB=E9=99=A4bootstrap?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/src/main/resources/web/code.ftl         | 2 ++
 server/src/main/resources/web/commonHeader.ftl | 2 --
 server/src/main/resources/web/markdown.ftl     | 2 ++
 server/src/main/resources/web/picture.ftl      | 2 +-
 server/src/main/resources/web/txt.ftl          | 2 ++
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/server/src/main/resources/web/code.ftl b/server/src/main/resources/web/code.ftl
index 5d53ae73..6e4555b8 100644
--- a/server/src/main/resources/web/code.ftl
+++ b/server/src/main/resources/web/code.ftl
@@ -5,6 +5,8 @@
     <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0">
     <title>代码预览</title>
     <#include  "*/commonHeader.ftl">
+    <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css"/>
+    <script src="bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.6.0/styles/default.min.css">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.6.0/highlight.min.js"></script>
     <script>hljs.highlightAll()</script>
diff --git a/server/src/main/resources/web/commonHeader.ftl b/server/src/main/resources/web/commonHeader.ftl
index 683e2247..717ad447 100644
--- a/server/src/main/resources/web/commonHeader.ftl
+++ b/server/src/main/resources/web/commonHeader.ftl
@@ -1,9 +1,7 @@
 <#setting classic_compatible=true>
 <link rel="icon" href="./favicon.ico" type="image/x-icon">
-<link rel="stylesheet" href="bootstrap/css/bootstrap.min.css"/>
 <script src="js/jquery-3.0.0.min.js" type="text/javascript"></script>
 <script src="js/jquery.form.min.js" type="text/javascript"></script>
-<script src="bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
 <script src="js/bootbox.min.js" type="text/javascript"></script>
 <script src="js/watermark.js" type="text/javascript"></script>
 <script src="js/base64.min.js" type="text/javascript"></script>
diff --git a/server/src/main/resources/web/markdown.ftl b/server/src/main/resources/web/markdown.ftl
index 4ca7293b..5a5d929f 100644
--- a/server/src/main/resources/web/markdown.ftl
+++ b/server/src/main/resources/web/markdown.ftl
@@ -4,6 +4,8 @@
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0">
     <title>markdown文本预览</title>
+    <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css"/>
+    <script src="bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
     <script src="js/marked.min.js" type="text/javascript"></script>
     <#include "*/commonHeader.ftl">
 </head>
diff --git a/server/src/main/resources/web/picture.ftl b/server/src/main/resources/web/picture.ftl
index 937de310..cb6baf71 100644
--- a/server/src/main/resources/web/picture.ftl
+++ b/server/src/main/resources/web/picture.ftl
@@ -24,7 +24,7 @@
         <#else>
             <#assign img="${baseUrl}${img}">
         </#if>
-        <li><img id="${img}"  url="${img}" src="${img}" width="1px" height="1px"></li>
+        <li><img id="${img}"  url="${img}" src="${img}" style="display: none"></li>
     </#list>
 </ul>
 
diff --git a/server/src/main/resources/web/txt.ftl b/server/src/main/resources/web/txt.ftl
index f994d4a2..eb287ade 100644
--- a/server/src/main/resources/web/txt.ftl
+++ b/server/src/main/resources/web/txt.ftl
@@ -4,6 +4,8 @@
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0">
     <title>${file.name}普通文本预览</title>
+    <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css"/>
+    <script src="bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
     <#include  "*/commonHeader.ftl">
 </head>
 <body>