diff options
author | Christoph Helma <helma@in-silico.de> | 2010-02-04 20:04:06 +0100 |
---|---|---|
committer | Christoph Helma <helma@in-silico.de> | 2010-02-04 20:04:06 +0100 |
commit | d0cfe86dc599215587f662f6934fe6462b1700f3 (patch) | |
tree | 1619441212be324cd2803da093bcfa6116125307 /views/layout.haml | |
parent | 6171a5a7879c0465f0eaea8f2451554882af4b92 (diff) | |
parent | 425a202ab54fbeb1d664584356b5d84c14ca516b (diff) |
merge conflict resolved for config.ru
Diffstat (limited to 'views/layout.haml')
-rw-r--r-- | views/layout.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/views/layout.haml b/views/layout.haml index 5426c34..c46638c 100644 --- a/views/layout.haml +++ b/views/layout.haml @@ -7,8 +7,10 @@ %link{:rel=>'stylesheet', :href=>'stylesheets/style.css', :type => "text/css"} %body - %h1 ToxModel - + .headline + %h1 ToxModel + %img{:src => "/opentox_logo.png", :alt => "OpenTox"} + .index %ul %li{:class => ("selected" if /create/ =~ request.path )} |