Merge branch 'master' into develop

2016-12-29 22:23:16 +08:00
parent fe71591200 b433736241
commit 5c07dd3023
2 changed files with 6 additions and 2 deletions
@@ -243,7 +243,11 @@ module.exports = function(grunt) {
            build: {
                options: {
                    base: '.tmp',
-                    method: 'append'
+                    method: 'append',
+                    unescape: {
+                        '&lt;': '<',
+                        '&gt;': '>'
+                    }
                },
                files: {
                    './front/build/main.html': ['.tmp/views/*.html']
@@ -26,7 +26,7 @@
    <link rel="preconnect" href="https://api.github.com">
    <link rel="dns-prefetch" href="https://api.github.com">

-<head>
+</head>

 <body ng-app="YellowLabTools">
    <div id="header"><h1>Yellow Lab <span class="icon-lab"></span> Tools</h1></div>