Merge remote-tracking branch 'origin/testserver' into testserver

ktali · Oct 14, 2018 · 79eba78 · 79eba78
2 parents e59647a + 9698bc1
commit 79eba78
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html
@@ -1,8 +1,8 @@
-<!DOCTYPE html>
+
 <html xmlns:th="http://www.thymeleaf.org" th:remove="tag">
-<head>
-    <link rel="stylesheet" type="text/css" href="/css/navbar.css"/>
-</head>
+
+<link rel="stylesheet" type="text/css" href="/css/navbar.css"/>
+
 <footer class="fixed-sidebar-left fixed-bottom">
     <div>
         <a href="/">index</a>

diff --git a/src/main/resources/templates/fragments/head.html b/src/main/resources/templates/fragments/head.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+
 <html xmlns:th="http://www.thymeleaf.org" th:remove="tag">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta id="_csrf" name="_csrf" th:content="${_csrf.token}"/>

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -2,7 +2,7 @@
 <html lang="en" xmlns:th="http://www.thymeleaf.org"> <!-- xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" -->
 <head>
     <th:block th:include="fragments/head" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <!-- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> -->
     <link rel="stylesheet" type="text/css" href="/css/index.css"/>
     <script src="/js/index.js"></script>
 </head>