Changes in text in home.ejs

16 files changed, 29 insertions, 44 deletions

diff --git a/public/css/shame.less b/public/css/shame.less
index 04e4aa6..997409b 100644
--- a/public/css/shame.less
+++ b/public/css/shame.less
@@ -239,5 +239,15 @@ div.lastactivity .activity .details {
     }
 }
 
+#vertical(@startColor: #555, @endColor: #333) {
+    background-color: mix(@startColor, @endColor, 60%);
+    background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
+    background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
+    background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10
+    background-repeat: repeat-x;
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down
+}
+
 
-/*@import "use.less";*/
diff --git a/public/css/use.less b/public/css/use.less
index 7788aa2..740818f 100644
--- a/public/css/use.less
+++ b/public/css/use.less
@@ -1,22 +1,10 @@
 /*#wrapper {
 	width:100%;
 	background-position: center 40%;
-}*/
-
-#vertical(@startColor: #555, @endColor: #333) {
-    background-color: mix(@startColor, @endColor, 60%);
-    background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
-    background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
-    background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10
-    background-repeat: repeat-x;
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down
 }
-
 .content {
   margin-left: 0px;
-}
+}*/
 .pitch {
   position: relative;
   margin-left: 10px;
@@ -37,18 +25,17 @@
   float: left;
   margin-top: 20px;
   margin-left: 10px;
-  margin-right: 0px;
+  margin-right: 20px;
 }
 .sectionright {
   float: right;
-  margin-top: 20px;
-  margin-right: 10px;
-  margin-left: 0px;
+  margin: 20px;
 }
 .tutorial {
   padding: 5px;
 }
 .infobox {
+  display: inline-block;
   text-align: center;
   /*background-color: @grayLighter;*/
 
@@ -88,7 +75,7 @@
 margin-top:45px;
 }
 .showcase {
-  height: 460px;
+  /*height: 460px;*/
   margin-top: 40px;
   margin-bottom: 20px;
   margin-left: 0px;
@@ -116,6 +103,7 @@ margin-top:45px;
 
 .scenario {
 margin:60px;
+text-align: center;
 }
 
 /*
@@ -123,22 +111,23 @@ margin:60px;
 	background-color:@grayLighter;
 }*/
 #hva {
-  height:460px;
+  /*height: 460px;*/
+  /*margin: 0 auto;*/
   margin-top: 25px;
   /*border-top: 2px solid #9fd5df;*/
-
-  color: #000000;
-  background-color: #eeeeee;
   box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2);
-  margin: 0 auto;
+  
   font-size: 18px;
   line-height: 26px;
   display: block;
 }
+
+#dildo 
+{}
 #hvor {
-  height:460px;
+  /*height:460px;*/
   margin-top: 25px;
   /*border-top: 2px solid #9fd5df;*/
 
@@ -147,13 +136,13 @@ margin:60px;
   box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2);
-  margin: 0 auto;
+  /*margin: 0 auto;*/
   font-size: 18px;
   line-height: 26px;
   display: block;
 }
 #hvordan {
- height:460px;
+  /*height:460px;*/
   margin-top: 25px;
   /*border-top: 2px solid #9fd5df;*/
 
@@ -162,26 +151,12 @@ margin:60px;
   box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2);
-  margin: 0 auto;
+  /*margin: 0 auto;*/
   font-size: 18px;
   line-height: 26px;
   display: block;
 }
 
-#android:hover {
-background-image: url('/img/androidA');
-}
-img.apple {
-background-image: url('/img/iphone');
-z-index:2;
-}
-img.apple:hover {
-background-image: url('/img/iphoneA');
-z-index:1;
-}
-#windows:hover {
-background-image: url('/img/winA');
-}
 /*
 #register {
   height:460px;
@@ -193,7 +168,7 @@ background-image: url('/img/winA');
   box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.2);
-  margin: 0 auto;
+  /*margin: 0 auto;*/
   font-size: 18px;
   line-height: 26px;
   display: block;
@@ -202,4 +177,4 @@ background-image: url('/img/winA');
 	background-color: #0D56A6; 
 	width:1170px;
 	height:100px;
-}*/
\ No newline at end of file
+}*/
diff --git a/public/img/androidA.png b/public/img/androidA.png
index 75736f3..afb53f9 100644
--- a/public/img/androidA.png
+++ b/public/img/androidA.png
diff --git a/public/img/androidA@2x.png b/public/img/androidA@2x.png
index 5b80fd9..204c8d0 100644
--- a/public/img/androidA@2x.png
+++ b/public/img/androidA@2x.png
diff --git a/public/img/dashboard.png b/public/img/dashboard.png
index 1b82ffc..0fdbc1f 100644
--- a/public/img/dashboard.png
+++ b/public/img/dashboard.png
diff --git a/public/img/dashboard@2x.png b/public/img/dashboard@2x.png
index 4f582b8..b154265 100644
--- a/public/img/dashboard@2x.png
+++ b/public/img/dashboard@2x.png
diff --git a/public/img/dennis.jpg b/public/img/dennis.jpg
new file mode 100644
index 0000000..9e86a1c
--- /dev/null
+++ b/public/img/dennis.jpg
diff --git a/public/img/erling.jpg b/public/img/erling.jpg
new file mode 100644
index 0000000..97e499e
--- /dev/null
+++ b/public/img/erling.jpg
diff --git a/public/img/iphoneA.png b/public/img/iphoneA.png
index 3d35eaf..0e0399a 100644
--- a/public/img/iphoneA.png
+++ b/public/img/iphoneA.png
diff --git a/public/img/iphoneA@2x.png b/public/img/iphoneA@2x.png
index a341671..e519291 100644
--- a/public/img/iphoneA@2x.png
+++ b/public/img/iphoneA@2x.png
diff --git a/public/img/par.png b/public/img/par.png
index 5b9beb2..3637a8e 100644
--- a/public/img/par.png
+++ b/public/img/par.png
diff --git a/public/img/par@2x.png b/public/img/par@2x.png
index 1797663..6c15675 100644
--- a/public/img/par@2x.png
+++ b/public/img/par@2x.png
diff --git a/public/img/robert.jpg b/public/img/robert.jpg
new file mode 100644
index 0000000..f4c0a69
--- /dev/null
+++ b/public/img/robert.jpg
diff --git a/public/img/stian.jpg b/public/img/stian.jpg
new file mode 100644
index 0000000..2b6ce31
--- /dev/null
+++ b/public/img/stian.jpg
diff --git a/public/img/winA.png b/public/img/winA.png
index b19d985..62bdb33 100644
--- a/public/img/winA.png
+++ b/public/img/winA.png
diff --git a/public/img/winA@2x.png b/public/img/winA@2x.png
index 638145e..cdb2313 100644
--- a/public/img/winA@2x.png
+++ b/public/img/winA@2x.png