aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/views
diff options
context:
space:
mode:
authorErling Aaby <erlinaa@stud.hist.no>2013-04-29 09:05:09 +0200
committerErling Aaby <erlinaa@stud.hist.no>2013-04-29 09:05:09 +0200
commita2655d69808dd11ed59888ae56a3d55ffa9043db (patch)
treef6f7c38d9a43d8ecefd5ce43a979b744d3dab049 /views
parentcreated faq.ejs, added imgs, modified app.js (diff)
parentFixed bugs and showcase (diff)
downloadDivid-a2655d69808dd11ed59888ae56a3d55ffa9043db.tar.gz
Merge branch 'master' of github.com:dennisse/Divid
Merge is necessary because faq.ejs should be added
Diffstat (limited to 'views')
-rw-r--r--views/home.ejs48
1 files changed, 23 insertions, 25 deletions
diff --git a/views/home.ejs b/views/home.ejs
index 02fff33..a764d54 100644
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -12,34 +12,32 @@
<!-- content
================================================== -->
<div class="span12 content">
- <div class="container">
+ <div class="container row">
<!-- Main hero unit for a primary marketing message or call to action -->
- <div class="span12 showcase">
- <div class="pitch"><h1>Samarbeid om felles utgifter:utlegg:lån</h1></div>
- <div class="span3 pitch">
- <ul>
- </li><h4><i class="icon-play"></i> Opprett prosjekt</h4></li>
- </li><h4><i class="icon-user"></i> Inviter deltakere</h4></li>
- </li><h4><i class="icon-barcode"></i> Før inn utgiftene</h4></li>
- <hr></hr>
- </li><h4><i class="icon-repeat"></i> Ta et oppgjør</h4></li>
- </ul>
- </div>
- <div class="span3 join">
- <a href="#" class="btn btn-large register">Registrer »</a>
- <p>Det er helt gratis!</p>
- <h4>Prøv også Divid appen:</h4>
- <img href="#" src="/img/appstore.png" class="marketbtn">
- <img href="#" src="/img/googleplay.png" class="marketbtn">
- </div>
- <div class="span6 dash">
+ <div class="span12 showcase row">
+ <div class="span5 pitch">
+ <div class="span12 row">
+ <h1>Samarbeid om utgifter</h1>
+ <ul>
+ </li><h4><i class="icon-play"></i> Opprett prosjekt og inviter deltakere</h4></li>
+ </li><h4><i class="icon-user"></i> Inviter deltakere</h4></li>
+ </li><h4><i class="icon-barcode"></i> Før inn utgiftene</h4></li>
+
+ </ul>
+ <hr class="divideLine"/>
+ </div>
+ <div class="span12 row">
+ <a href="#" class="btn btn-large register">Registrer »</a>
+ <p>Det er helt gratis!</p>
+ <h4>Prøv også Divid appen:</h4>
+ <img href="#" src="/img/appstore.png" class="marketbtn">
+ <img href="#" src="/img/googleplay.png" class="marketbtn">
+ </div>
+ </div>
+ <div class="span7 dash">
<img src="/img/dashboard.png">
</div>
- <div class="span3 pdash">
- <img src="/img/pdashboard.png">
- </div>
- </div>
</div>
</div>
</div>
@@ -67,7 +65,7 @@
<div class="container last">
<div class="span6 sectionright">
<h1>Hvem er denne tjenesten for?</h1>
- <h5>Divid er ikke for alle. Å dele er sosialt og derfor holder Divid det sosialt.</h5>
+ <h5>Divid er for alle. Å dele er sosialt og derfor holder Divid det sosialt.</h5>
<ul>
<li>Studenter - i kollektiv</li>
<li>Singel - ute på farten i sosialt lag</li>