added ist_logo

3 files changed, 24 insertions, 10 deletions

diff --git a/public/ist_logo.png b/public/ist_logo.png
new file mode 100644
index 0000000..2ad562c
--- /dev/null
+++ b/public/ist_logo.png
diff --git a/views/layout.haml b/views/layout.haml
index 6992489..b46fc7d 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -48,13 +48,17 @@
       %div{ :style=>"width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"}
         Your web browser must have JavaScript enabled in order for this application to display correctly.
 
+    .logo
+      %a{:href => "/"}
+        %img{:src => "/ist_logo.png", :alt => "logo"}
     %h1 PubChem read across
-    %button{:id=>"about", :style => "margin-left:80%;z-index:4;position:absolute; top:10px; right:0px;"}
+    %button{:id=>"about", :style => "margin-left:80%;margin-right:20px;z-index:4;position:absolute;top:10px;right:0px;"}
       About this service 
     :javascript
       $("#about").click(function() {
         $("#info").toggle();
       });
+
     #info{:style => "display:none;z-index:5;position:fixed; top:10px; left:25%; width: 50%; background-color:#F5F5F5;border:solid 1px black;"}
       %button{:id => "x", :style => "position:absolute;right:0px;"} x
       :javascript
@@ -69,11 +73,13 @@
           %dd
             Filtered experimental data from pubchem database.
             %br
+            %br
           %dt
             (read across)
           %dd
             Predictions - results of processed pubchem data.
             %br
+            %br
           %dt
             Predictions relationship
           %dd
@@ -93,7 +99,7 @@
 
     .footer
       ©
-      %a{:href => 'http://www.in-silico.ch', :rel => "external"} <i style="font-family: serife">in silico</i> toxicology gmbh 2013 - 2014
+      %a{:href => 'http://www.in-silico.ch', :rel => "external"} <i style="font-family: serife">in silico</i> toxicology gmbh 2013 - #{Time.now.year.to_s}
       :javascript
         $('A[rel="external"]').each(function(){
           $(this).attr('target', 'external');
diff --git a/views/style.scss b/views/style.scss
index 25833e7..2b2f0d5 100644
--- a/views/style.scss
+++ b/views/style.scss
@@ -7,7 +7,7 @@ body {
   margin: {
     left: 20px;
     right: 20px;
-    top: 0px;
+    top: 8px;
   }
   font: {
     family: arial,helvetica,clean,sans-serif;
@@ -15,14 +15,22 @@ body {
 }
 
 /* headings */
-h1 {
-  font: {
-    family: Helvetia, Verdana, sans;
-    weight: bold;
-    size: 1.4em;
+.logo {
+  img {
+    float: left;
+    display: inline;
+    margin-right: 1em;
+  }
+
+  h1 {
+    font: {
+      family: Helvetia, Verdana, sans;
+      weight: bold;
+      size: 1.4em;
+    }
+    color: #333;
+    margin-top: 10px;
   }
-  color: #333;
-  margin-top: 10px;
 }
 h4 {
   color: #333;