commit fc29cabac17cb26183b95e25377ca497ed86edca
author edendramis <evangeliad@gmail.com> Wed Jul 01 22:05:18 2015 -0700
committer edendramis <evangeliad@gmail.com> Wed Jul 01 22:05:18 2015 -0700
tree c83b1af25dfa74e8fb44a55f2fa55967f0c33ec6
parent dc80afe382186aa13e387aa95a74f9c1099bd975
parent 1f8800cce2b46805c72e00fb959d829c3641ccd8

Merge branch 'master' of github.com:freemarker/docgen

src/main/org/freemarker/docgen/less/lib/components/logo.less

diff --git a/src/main/org/freemarker/docgen/less/lib/components/logo.less b/src/main/org/freemarker/docgen/less/lib/components/logo.less
index 7a29553..3a8c619 100644
--- a/src/main/org/freemarker/docgen/less/lib/components/logo.less
+++ b/src/main/org/freemarker/docgen/less/lib/components/logo.less
@@ -1,11 +1,12 @@
 .logo {
-  color: #fff;
-  font-size: 30px;
-  line-height: 1;
   padding: 6px 0 0;
   display: block;
 
-  &:hover {
-    color: #fff;
+  img {
+    // @todo: externalize width and height
+    display: block;
+    width: 202px;
+    height: 19px;
   }
+
 }

src/main/org/freemarker/docgen/templates/page.ftl

diff --git a/src/main/org/freemarker/docgen/templates/page.ftl b/src/main/org/freemarker/docgen/templates/page.ftl
index 1b7838c..b3b1b5a 100644
--- a/src/main/org/freemarker/docgen/templates/page.ftl
+++ b/src/main/org/freemarker/docgen/templates/page.ftl
@@ -42,7 +42,7 @@
       <@metaTags siteName=topLevelTitle title=title?html?replace('&#39;', '\'') />
       <@canonicalUrl />
 
-      <link rel="icon" href="favicon.ico" type="image/x-icon">
+      <link rel="icon" href="favicon.png" type="image/png"><#-- @todo: pull this in dynamically -->
       <@css />
 
       <#if !offline && onlineTrackerHTML??>
@@ -210,4 +210,4 @@
 
 <#function getPageType>
   <#return pageType!.node?nodeName>
-</#function>
\ No newline at end of file
+</#function>