Merge branch 'master' into imprv/migrate-to-jquery3

lib/views/layout/admin.html

@@ -1,6 +1,7 @@
 {% extends '2column.html' %}
 
-{% block footer %}
-  <script src="{{ webpack_asset('legacy-admin').js }}"></script>
-{% endblock footer %}
+{% block html_head %}
+  {% parent %}
+  <script src="{{ webpack_asset('legacy-admin').js }}" defer></script>
+{% endblock %}
 

resource/css/_page.scss

@@ -1,3 +1,6 @@
+// import diff2html styles
+@import "~diff2html/dist/diff2html.css";
+
 .crowi.main-container {
   // padding controll of .header-wrap and .content-main are moved to _layout and _form