Merge branch 'dev-1.2.0'

This commit is contained in:
suxiaoxin 2017-11-13 11:25:40 +08:00
commit 4287d9cd9d
3 changed files with 4 additions and 0 deletions

View File

@ -93,6 +93,7 @@ class exportController extends baseController{
}); });
return createHtml5(left, content); return createHtml5(left, content);
} }
function escapeStr(str){ function escapeStr(str){
return !isMarkdown ? escape(str) : str; return !isMarkdown ? escape(str) : str;
@ -104,6 +105,7 @@ class exportController extends baseController{
<html> <html>
<head> <head>
<title>${curProject.name}</title> <title>${curProject.name}</title>
<meta charset="utf-8" />
${defaultTheme} ${defaultTheme}
</head> </head>
<body> <body>

View File

@ -320,6 +320,7 @@ body > pre {
font-size: 16px; font-size: 16px;
position: absolute; position: absolute;
right: 32px; right: 32px;
top: 0
} }
.m-header .nav a { .m-header .nav a {
color: #fff; color: #fff;

View File

@ -315,6 +315,7 @@ body>pre {
font-size: 16px; font-size: 16px;
position: absolute; position: absolute;
right: 32px; right: 32px;
top: 0;
a { a {
color: #fff; color: #fff;
margin-left: 16px; margin-left: 16px;