From 3b594fde256eec3885a586119365d36cd0eb8f4b Mon Sep 17 00:00:00 2001
From: Erling Aaby <spa440w@gmail.com>
Date: Tue, 23 Apr 2013 15:54:11 +0200
Subject: Added 1 more sec to animation and placed logo

---
 public/css/devanim.less | 8 ++++----
 views/navbar.ejs        | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/public/css/devanim.less b/public/css/devanim.less
index b3b2934..478f002 100644
--- a/public/css/devanim.less
+++ b/public/css/devanim.less
@@ -12,10 +12,10 @@
   margin: 0 auto;
   margin-top: 10px;
   background: white;
-  -webkit-animation: devices 9s ease 0s infinite;
-  -moz-animation: devices 9s ease 0s infinite;
-  -o-animation: devices 9s ease 0s infinite;
-  animation: devices 9s ease 0s infinite;
+  -webkit-animation: devices 10s ease 0s infinite;
+  -moz-animation: devices 10s ease 0s infinite;
+  -o-animation: devices 10s ease 0s infinite;
+  animation: devices 10s ease 0s infinite;
 }
 
 @-webkit-keyframes devices {
diff --git a/views/navbar.ejs b/views/navbar.ejs
index c339acc..f1899e2 100644
--- a/views/navbar.ejs
+++ b/views/navbar.ejs
@@ -41,12 +41,15 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
+						<span class="icon-bar"></span>
                     </button>
-                    <a class="brand" href="#">Divid</a>
+					<img class="brand" src="/img/dividlogo.png" href="#">
+                    <!--<a class="brand" href="#">Divid</a>--!>
                     <div class="nav-collapse collapse">
                         <ul class="nav">
                             <li><a href="#signup">signup</a></li>
                             <li><a href="#dashboard">Dashboard</a></li>
+							<li><a href="#kontakt"><kontakt</a></li>
                         </ul>
                     </div>
                     <% if(!loggedin) { %><a class="brand login" data-toggle="collapse" data-target=".login-collapse" href="#login">Logg inn</a>
-- 
cgit v1.2.3