Skip to content

S
solo
Commit 348dcb07 authored by dashu's avatar dashu
Browse files
Options

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

parents ccbb7df4 b9217c4e
Show whitespace changes
Inline Side-by-side
Showing with 69 additions and 67 deletions
war/src/main/webapp/skins/ease/macro-head.ftl
View file @ 348dcb07
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<#nested> <#nested>
<meta name="author" content="B3log Team" /> <meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log" /> <meta name="generator" content="B3log Solo" />
<meta name="copyright" content="B3log" /> <meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" /> <meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta http-equiv="Window-target" content="_top" /> <meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" /> <link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />
......
war/src/main/webapp/skins/mobile/macro-head.ftl
View file @ 348dcb07
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<#nested> <#nested>
<meta name="author" content="B3log Team" /> <meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log" /> <meta name="generator" content="B3log Solo" />
<meta name="copyright" content="B3log" /> <meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" /> <meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<meta http-equiv="Window-target" content="_top" /> <meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/themes/default/style.css?${staticResourceVersion}" charset="utf-8" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/themes/default/style.css?${staticResourceVersion}" charset="utf-8" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment