Add preliminary logo and favicon.

rmoorman · Aug 19, 2010 · 9e4ee35 · 9e4ee35
1 parent f4f2168
commit 9e4ee35
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -4,6 +4,8 @@
     %meta{:charset => 'utf-8'}/
     %meta{:content => "Simon Huerlimann &lt;simon.huerlimann@cyt.ch&gt;", :name => "author"}/
 
+    %link{:rel => "shortcut icon", :href => image_path('favicon.ico')}/
+
     = stylesheet_link_tag 'compiled/screen.css', :media => 'screen, projection'
     = stylesheet_link_tag 'compiled/print.css', :media => 'print'
     /[if lt IE 8]
@@ -16,6 +18,9 @@
   %body
     #container
       #header
+        #logo{:style => 'margin: 14px; float: left;'}
+          = image_tag('logo.png')
+          %h1{:style => 'display: inline; color: #002B3D'} CyBook
         #main-menu
           %ul
             %li

diff --git a/public/images/favicon.ico b/public/images/favicon.ico
diff --git a/public/images/logo.png b/public/images/logo.png