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
Hide 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
<#macro head title> <#macro head title>
<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 http-equiv="Window-target" content="_top" /> <meta name="revised" content="${blogTitle?html}, ${year}" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <meta http-equiv="Window-target" content="_top" />
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />
${htmlHead} <link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
${htmlHead}
</#macro> </#macro>
\ No newline at end of file
war/src/main/webapp/skins/mobile/macro-head.ftl
View file @ 348dcb07
<#macro head title> <#macro head title>
<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="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" /> <meta name="revised" content="${blogTitle?html}, ${year}" />
<meta http-equiv="Window-target" content="_top" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/themes/default/style.css?${staticResourceVersion}" charset="utf-8" /> <meta http-equiv="Window-target" content="_top" />
<style type="text/css"> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/themes/default/style.css?${staticResourceVersion}" charset="utf-8" />
#headerbar, #wptouch-login, #wptouch-search { <style type="text/css">
background: #000000 url(/skins/${skinDirName}/themes/core/core-images/head-fade-bk.png); #headerbar, #wptouch-login, #wptouch-search {
} background: #000000 url(/skins/${skinDirName}/themes/core/core-images/head-fade-bk.png);
#headerbar-title, #headerbar-title a { }
color: #eeeeee; #headerbar-title, #headerbar-title a {
} color: #eeeeee;
#wptouch-menu-inner a:hover { }
color: #006bb3; #wptouch-menu-inner a:hover {
} color: #006bb3;
#catsmenu-inner a:hover { }
color: #006bb3; #catsmenu-inner a:hover {
} color: #006bb3;
#drop-fade { }
background: #333333; #drop-fade {
} background: #333333;
a, h3#com-head { }
color: #006bb3; a, h3#com-head {
} color: #006bb3;
}
a.h2, a.sh2, .page h2 {
font-family: 'Helvetica Neue'; a.h2, a.sh2, .page h2 {
} font-family: 'Helvetica Neue';
}
a.h2{
text-overflow: ellipsis; a.h2{
white-space: nowrap; text-overflow: ellipsis;
overflow: hidden; white-space: nowrap;
} overflow: hidden;
}
</style>
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" /> </style>
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />
<script type='text/javascript' src='${staticServePath}/skins/${skinDirName}/js/l10n.js?${staticResourceVersion}'></script> <link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
<script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script> <script type='text/javascript' src='${staticServePath}/skins/${skinDirName}/js/l10n.js?${staticResourceVersion}'></script>
<script type='text/javascript' src='${staticServePath}/skins/${skinDirName}/themes/core/core.js?${staticResourceVersion}'></script> <script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
<script type="text/javascript"> <script type='text/javascript' src='${staticServePath}/skins/${skinDirName}/themes/core/core.js?${staticResourceVersion}'></script>
// Hides the addressbar on non-post pages <script type="text/javascript">
function hideURLbar() { window.scrollTo(0,1); } // Hides the addressbar on non-post pages
addEventListener('load', function() { setTimeout(hideURLbar, 0); }, false ); function hideURLbar() { window.scrollTo(0,1); }
</script> addEventListener('load', function() { setTimeout(hideURLbar, 0); }, false );
${htmlHead} </script>
${htmlHead}
</#macro> </#macro>
\ No newline at end of file
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