Minor cleanup so there are fewer diffs when in the resulting 'publish' dir
Project: http://git-wip-us.apache.org/repos/asf/shiro-site/repo Commit: http://git-wip-us.apache.org/repos/asf/shiro-site/commit/d6af0050 Tree: http://git-wip-us.apache.org/repos/asf/shiro-site/tree/d6af0050 Diff: http://git-wip-us.apache.org/repos/asf/shiro-site/diff/d6af0050 Branch: refs/heads/master Commit: d6af00504f732e2ce3699c5c3f06762a9e6dccb7 Parents: 07b38e4 Author: Brian Demers <[email protected]> Authored: Wed Oct 19 10:23:04 2016 -0400 Committer: Brian Demers <[email protected]> Committed: Wed Oct 19 10:23:04 2016 -0400 ---------------------------------------------------------------------- templates/default.vtl | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/shiro-site/blob/d6af0050/templates/default.vtl ---------------------------------------------------------------------- diff --git a/templates/default.vtl b/templates/default.vtl index fb5a781..1c81938 100644 --- a/templates/default.vtl +++ b/templates/default.vtl @@ -15,9 +15,7 @@ limitations under the License. --> <html> - #parse("templates/includes.vtl") - <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="description" content="Apache Shiro is a powerful and easy-to-use Java security framework that performs authentication, authorization, cryptography, and session management."> @@ -42,23 +40,17 @@ </title> - <link rel="stylesheet" href="$root/assets/css/gh-pages/gh-fork-ribbon.css" /> - <!--[if lt IE 9]> - <link rel="stylesheet" href="$root/assets/css/gh-pages/gh-fork-ribbon.ie.css" /> - <![endif]--> - <link rel="icon" type="image/vnd.microsoft.icon" href="$root/assets/images/favicon.ico"> <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";> - <!-- - <link rel="stylesheet" href="https://oss.maxcdn.com/libs/normalize-css/3.0.0/normalize.min.css";> - --> - <link rel="stylesheet" type="text/css" href="$root/assets/css/normalize.css"> - <link rel="stylesheet" type="text/css" href="$root/assets/css/confluence.css" media="screen"> <link rel="stylesheet" type="text/css" href="$root/assets/css/style.css"> + <link rel="stylesheet" href="$root/assets/css/gh-pages/gh-fork-ribbon.css" /> + <!--[if lt IE 9]> + <link rel="stylesheet" href="$root/assets/css/gh-pages/gh-fork-ribbon.ie.css" /> + <![endif]--> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script> <script type="text/javascript" src="$root/assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
