From 075ff5c7a7bdddca3a12ab0a45c8ba51e83a5121 Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Sun, 26 May 2013 15:53:44 +0200
Subject: fixed some colours and shit on the homepage

---
 app/views/index.ejs   | 30 ++++++++++++++++--------------
 public/css/shame.less | 30 ++++++++++++++++++++++++++----
 2 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/app/views/index.ejs b/app/views/index.ejs
index 8f208b4..043c047 100644
--- a/app/views/index.ejs
+++ b/app/views/index.ejs
@@ -24,6 +24,11 @@
                     <img src="/img/dashboard.png">
                 </div>
             </div>
+        </div>
+    </div>
+
+    <div class="indexwrapper" id="index2">
+        <div class="container">
             <div class="row-fluid">
                 <div class="span4 infobox">
                     <img class="infoimg" src="/img/laptop.png">
@@ -44,7 +49,7 @@
         </div>
     </div>
 
-    <div class="indexwrapper" id="index2">
+    <div class="indexwrapper" id="index3">
         <div class="container">
             <h1>Hva kan Divid brukes til</h1>
             <div class="row-fluid">
@@ -73,20 +78,10 @@
         </div>
     </div>
 
-
-    <div class="indexwrapper" id="index3">
-        <div class="container">
-            <h1>Hvordan bruke Divid</h1>
-
-            <a href="https://itunes.apple.com/us/genre/ios-finance/id6015?mt=8"><img src="/img/iph.png" onmouseover="this.src='/img/iphoneA.png'" onmouseout="this.src='/img/iph.png'"></a>
-            <a href="https://play.google.com/store"><img src="/img/android.png" onmouseover="this.src='/img/androidA.png'" onmouseout="this.src='/img/android.png'"></a>
-            <a href="http://www.windowsphone.com/nb-no/store"><img src="/img/win.png" onmouseover="this.src='/img/winA.png'" onmouseout="this.src='/img/win.png'"></a>
-        </div>
-    </div>
-
-
     <div class="indexwrapper" id="index4">
         <div class="container">
+            <div class="row-fluid">
+                <div class="span7">
             <h1>Registrer deg i dag!</h1>
             <p>Du kan enten bruke <a href="/auth/facebook">Facebook</a> eller <a href="/auth/twitter">Twitter</a>, eller registrere deg med epost under!</p>
             <div class="control-group">
@@ -114,11 +109,18 @@
                 </div>
             </div>
             <div class="control-group">
-                <div class="form-actions"><a id="register" class="hidden">a</a>
+                <div class="controls"><a id="register" class="hidden">a</a>
                     <input type="submit" class="btn btn-primary" value="Registrer!">
                 </div>
             </div>
 
+                </div>
+                <div class="span5">
+            <a href="https://itunes.apple.com/us/genre/ios-finance/id6015?mt=8"><img src="/img/iph.png" onmouseover="this.src='/img/iphoneA.png'" onmouseout="this.src='/img/iph.png'"></a>
+            <a href="https://play.google.com/store"><img src="/img/android.png" onmouseover="this.src='/img/androidA.png'" onmouseout="this.src='/img/android.png'"></a>
+            <a href="http://www.windowsphone.com/nb-no/store"><img src="/img/win.png" onmouseover="this.src='/img/winA.png'" onmouseout="this.src='/img/win.png'"></a>
+                </div>
+            </div>
         </div>
     </div>
 
diff --git a/public/css/shame.less b/public/css/shame.less
index 2136425..d202649 100644
--- a/public/css/shame.less
+++ b/public/css/shame.less
@@ -10,7 +10,8 @@
 
 @blueDark:      #0d56a6;
 @blueMedium:    #4186d3;
-@blueLight:     #000022;
+@blueLight:     #689ad3;
+@ourOrange:     #ff9a00;
 
 
 
@@ -232,21 +233,42 @@ div.lastactivity .activity .details {
 
 .indexwrapper {
     width: 100%;
+    background-color: @blueLight;
 }
 
 #index1 {
 
 }
 
+.indexwrapper .container {
+    box-shadow: 0 2px 2px rgba(0,0,0,.5);
+    padding: 20px;
+    background-color: @white;
+}
+
+#index2 {
+}
+
+#index2 .container {
+    background-color: #ecf2fa;
+
+}
+
 #index3 {
-    background-color: @blueMedium;
+}
+#index3 .container {
 }
 
 #index4 {
-    background-color: @blueDark;
-    color: @yellow;
+
 }
+#index4 a {
 
+    color: @ourOrange;
+}
+#index4 .container {
+    background-color: #ecf2fa;
+}
 .infobox {
     text-align: center;
     padding: 46px;
-- 
cgit v1.2.3