Merge branch 'dev' of https://github.com/NyaaPantsu/nyaa into dev

templates/index.html

@@ -13,6 +13,8 @@
     <!-- RSS Feed with Context -->
     <link href="{{ block "rss_link" . }}{{ genRouteWithQuery "feed" .URL }}{{end}}" rel="alternate" type="application/rss+xml" title="Nyaa Pantsu - {{block "rsstitle" .}}Last torrents{{end}} RSS Feed" />
 
+    <!-- do NOT move -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">
 
     <link rel="stylesheet" id="style" href="{{.URL.Parse "/css/main.css"}}?v=3">
     <link rel="stylesheet" id="theme" href="">

templates/upload.html

@@ -48,6 +48,3 @@
 <script type="text/javascript" src="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script>
 <script type="text/javascript">new SimpleMDE({ element: document.getElementById("desc"), spellChecker: false });</script>
 {{end}}
-{{ define "additional_header"}}
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">
-{{end}}