styling fixed

3 files changed, 68 insertions, 41 deletions

diff --git a/views/layout.haml b/views/layout.haml
index 6d0a1a1..34c3f94 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -8,27 +8,26 @@
     %title in silico toxicology
 
   %body
-    .header
-      .logo
-        %img{ :src => "/logo.jpg", :alt => "in silico toxicology" }
-        .desc
-          research + consulting
-      .index
-        %ul
-          %li{:class => ("selected" if /^\/$/ =~ request.path )}
-            %a{ :href => "/" } Home
-          %li{:class => ("selected" if /software/ =~ request.path )}
-            %a{ :href => "/software" } Software
-          %li{:class => ("selected" if /services/ =~ request.path )}
-            %a{ :href => "/services" } Services
-          %li{:class => ("selected" if /projects/ =~ request.path )}
-            %a{ :href => "/projects" } Projects
-          %li{:class => ("selected" if /publications/ =~ request.path )}
-            %a{ :href => "/publications" } Publications
-          %li{:class => ("selected" if /awards/ =~ request.path )}
-            %a{ :href => "/awards" } Awards
-          %li{:class => ("selected" if /contact/ =~ request.path )}
-            %a{ :href => "/contact" } Contact
+    .logo
+      %em in silico
+      %code toxicology
+      -#%img{ :src => "/logo.jpg", :alt => "in silico toxicology" }
+    .index
+      %ul
+        %li{:class => ("selected" if /^\/$/ =~ request.path )}
+          %a{ :href => "/" } Home
+        %li{:class => ("selected" if /software/ =~ request.path )}
+          %a{ :href => "/software" } Software
+        %li{:class => ("selected" if /services/ =~ request.path )}
+          %a{ :href => "/services" } Services
+        %li{:class => ("selected" if /projects/ =~ request.path )}
+          %a{ :href => "/projects" } Projects
+        %li{:class => ("selected" if /publications/ =~ request.path )}
+          %a{ :href => "/publications" } Publications
+        %li{:class => ("selected" if /awards/ =~ request.path )}
+          %a{ :href => "/awards" } Awards
+        %li{:class => ("selected" if /contact/ =~ request.path )}
+          %a{ :href => "/contact" } Contact
 
     .content
       = yield
diff --git a/views/software.haml b/views/software.haml
index 688d47a..a231252 100644
--- a/views/software.haml
+++ b/views/software.haml
@@ -11,7 +11,7 @@ software:
   %li
     The
     %code
-      %a{ :href => "http://www.in-silico.de/lazar/" } lazar
+      %a{ :href => "http://lazar.in-silico.de/" } lazar
     (
     %em Lazy Structure- Activity Relationships
     ) program for the prediction of toxic activities and webservices.
diff --git a/views/style.sass b/views/style.sass
index 1f9cc5b..8fd2402 100644
--- a/views/style.sass
+++ b/views/style.sass
@@ -1,34 +1,62 @@
+!fg = #333333
+!bg = #B9DCFF
+!hl = yellow
+
 body
+  font-family: Verdana
   background-color: white
-  min-width: 50em
-  max-width: 50em
+  color = !fg
   
-  .header
+  .logo
     background-color: white
+    font-size: xx-large
+    text-align: right
+    em
+      font-family: serif
+      font-style: italic
 
-    .logo
-      background-color: rgb(128,128,255)    
-      
-    .desc   	
-      display: inline
-      color: white
-      padding: 1px
+    code
+      font-family: monospace
+      font-weight: bold
+
+  .index
+    margin: 0
+    padding: 0
+    background-color: white
+   
+    ul
+      margin: 0
+      padding: 0
+      white-space: nowrap
+      list-style-type: none
 
-    .index
-      background-color: rgb(128,128,255)
-     
       li
         display: inline
-        padding: 1em 
-        &hover: red 
+        border: 1px solid white
+        border-bottom: 2px  solid white
+        background-color: grey
+        padding-left: 0.5em
+        padding-right: 0.5em
+        a
+          text-decoration: none
+          color = !bg
+          &:hover
+            color = !hl
       
       li.selected
-        background-color: white
-        color: black
+        background-color = !bg
+        border-bottom:
+          color = !bg
+        a
+          text-decoration: none
+          color = !fg
+          &:hover
+            color = !hl
 
   .content
-    background-color: white
+    background-color = !bg
     padding: 0.5em
+    border: 1px solid white
 
     dt
       padding-right: 0.5em
@@ -36,6 +64,6 @@ body
       clear: left
       
   .footer
-    background-color: rgb(128,128,255)
+    background-color: white