From d1a0df100072085fbb90262f32a209f2372952c5 Mon Sep 17 00:00:00 2001
From: Erling Aaby <erlinaa@stud.hist.no>
Date: Thu, 2 May 2013 10:36:22 +0200
Subject: Changes to navbar, home, and faq

---
 public/css/use.less | 4 +---
 views/faq.ejs       | 2 +-
 views/home.ejs      | 3 ++-
 views/navbar.ejs    | 6 +++++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/public/css/use.less b/public/css/use.less
index 740818f..5c7a5b8 100644
--- a/public/css/use.less
+++ b/public/css/use.less
@@ -5,6 +5,7 @@
 .content {
   margin-left: 0px;
 }*/
+
 .pitch {
   position: relative;
   margin-left: 10px;
@@ -38,7 +39,6 @@
   display: inline-block;
   text-align: center;
   /*background-color: @grayLighter;*/
-
   padding: 46px;
   margin-bottom: 20px;
   border: 1px solid white;
@@ -124,8 +124,6 @@ text-align: center;
   display: block;
 }
 
-#dildo 
-{}
 #hvor {
   /*height:460px;*/
   margin-top: 25px;
diff --git a/views/faq.ejs b/views/faq.ejs
index 0118d08..6137309 100644
--- a/views/faq.ejs
+++ b/views/faq.ejs
@@ -213,7 +213,7 @@
 							
 						</div>
 					</div>
-					<h3>Skulle du ha flere spørsmål sjekk forumet, se forum, Facebook like page eller kontakt oss på support(a)divid.no </h3>
+					<h4>Skulle du ha flere spørsmål sjekk forumet, se forum, Facebook like page eller kontakt oss på support(a)divid.no </h4>
 				</div>
 			</div><!-- /div.row -->
 		</div><!-- /div#wrapper -->
diff --git a/views/home.ejs b/views/home.ejs
index 2539f2a..6d134c8 100644
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -29,6 +29,7 @@
                             </ul>
                         </div>
                         <div class="span12 row">
+							<p>Perfekt for venner, familie og bekjente</p>
 					    	<a href="#" class="btn btn-large register">Registrer »</a>
 							<button class="btn-primary btn-large btn-thumbs-up like"><i class="icon-thumbs-up icon-white"></i> Like!</button>
                         </div>
@@ -75,7 +76,7 @@
 						<p>Ute på farten, stelle i stand aktiviter med andre, sydentur osv</p>
 				</div>
 				<div class="span2 scenario">
-						<img src="/img/flytting.png">
+						<img src="/img/par.png">
 						<h4>Parforhold</h4>
 						<p>I etableringsfasen som ønsker å ha ordnet økonomi fra starten av</p>
 				</div>
diff --git a/views/navbar.ejs b/views/navbar.ejs
index 9f02e9f..e0657d1 100644
--- a/views/navbar.ejs
+++ b/views/navbar.ejs
@@ -49,6 +49,8 @@
                             <span class="icon-bar"></span>
                             <span class="icon-bar"></span>
                             <span class="icon-bar"></span>
+							<span class="icon-bar"></span>
+							<span class="icon-bar"></span>
                         </button>
                         <% if(!loggedin) { %><a class="brand login" data-toggle="collapse" data-target=".login-collapse" href="#login">Logg inn</a>
                         <% } else { %><a href="/logout" class="brand login">Logg ut</a>
@@ -56,7 +58,9 @@
                     </div>
                     <div class="nav-collapse collapse">
                         <ul class="nav menu">
-                            <li><a href="#faq">FAQ</a></li>
+                            <li><a href="/home/faq">FAQ</a></li>
+							<li><a href="/home/forum">Forum</a></li>
+							<li><a href="/home/contact">Kontakt</a></li>
                             <li><a href="/project/new">Nytt prosjekt</a></li>
                             <li><a href="/dashboard">Dashboard</a></li>
                         </ul>
-- 
cgit v1.2.3