From 5f61285205f82e6d8eaf8610c51445c1577bc76c Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Tue, 30 Apr 2013 08:23:31 +0200 Subject: Added better img of androidA.png --- public/img/androidA.png | Bin 5288 -> 5772 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'public') diff --git a/public/img/androidA.png b/public/img/androidA.png index 75736f3..a0c2f94 100644 Binary files a/public/img/androidA.png and b/public/img/androidA.png differ -- cgit v1.2.3 From 28cf2223e6678b689ad01a99decb3371f8a15bcd Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Tue, 30 Apr 2013 08:26:15 +0200 Subject: added mouseover for app store links --- public/css/use.less | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'public') diff --git a/public/css/use.less b/public/css/use.less index 7788aa2..4f2dbb9 100644 --- a/public/css/use.less +++ b/public/css/use.less @@ -168,20 +168,6 @@ margin:60px; 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; -- cgit v1.2.3 From a3d3af7a06369c5584ba4a94b8a79c936515de62 Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Tue, 30 Apr 2013 08:57:00 +0200 Subject: test --- public/css/use.less | 3 +++ 1 file changed, 3 insertions(+) (limited to 'public') diff --git a/public/css/use.less b/public/css/use.less index 4f2dbb9..21fd841 100644 --- a/public/css/use.less +++ b/public/css/use.less @@ -137,6 +137,9 @@ margin:60px; line-height: 26px; display: block; } + +#dildo +{} #hvor { height:460px; margin-top: 25px; -- cgit v1.2.3 From 344f400be5acfc28059a90834487081251b7cc67 Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Tue, 30 Apr 2013 09:06:05 +0200 Subject: moved #vertical and removed use.less completely from shame.less --- public/css/shame.less | 12 +++++++++++- public/css/use.less | 14 +------------- 2 files changed, 12 insertions(+), 14 deletions(-) (limited to 'public') 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 21fd841..329f56d 100644 --- a/public/css/use.less +++ b/public/css/use.less @@ -2,18 +2,6 @@ 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; } @@ -191,4 +179,4 @@ margin:60px; background-color: #0D56A6; width:1170px; height:100px; -}*/ \ No newline at end of file +}*/ -- cgit v1.2.3 From acbdbe45a76a2d7b93fe565d43cd9760fa6e2e71 Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Tue, 30 Apr 2013 09:12:06 +0200 Subject: Fixed desktop images for divid home --- public/img/dashboard.png | Bin 127906 -> 128952 bytes public/img/dashboard@2x.png | Bin 339575 -> 342282 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'public') diff --git a/public/img/dashboard.png b/public/img/dashboard.png index 1b82ffc..0fdbc1f 100644 Binary files a/public/img/dashboard.png and b/public/img/dashboard.png differ diff --git a/public/img/dashboard@2x.png b/public/img/dashboard@2x.png index 4f582b8..b154265 100644 Binary files a/public/img/dashboard@2x.png and b/public/img/dashboard@2x.png differ -- cgit v1.2.3 From 2a0dfb6928d30213fc539a5ce8a4718bb9c383d8 Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Tue, 30 Apr 2013 10:32:05 +0200 Subject: Changed icon mouseovers for Divid home --- public/img/androidA.png | Bin 5772 -> 12586 bytes public/img/androidA@2x.png | Bin 5059 -> 28174 bytes public/img/iphoneA.png | Bin 4283 -> 13721 bytes public/img/iphoneA@2x.png | Bin 5906 -> 35316 bytes public/img/winA.png | Bin 5296 -> 7287 bytes public/img/winA@2x.png | Bin 4678 -> 19201 bytes 6 files changed, 0 insertions(+), 0 deletions(-) (limited to 'public') diff --git a/public/img/androidA.png b/public/img/androidA.png index a0c2f94..910e2a5 100644 Binary files a/public/img/androidA.png and b/public/img/androidA.png differ diff --git a/public/img/androidA@2x.png b/public/img/androidA@2x.png index 5b80fd9..9df89ba 100644 Binary files a/public/img/androidA@2x.png and b/public/img/androidA@2x.png differ diff --git a/public/img/iphoneA.png b/public/img/iphoneA.png index 3d35eaf..bd6956f 100644 Binary files a/public/img/iphoneA.png and b/public/img/iphoneA.png differ diff --git a/public/img/iphoneA@2x.png b/public/img/iphoneA@2x.png index a341671..d8e2967 100644 Binary files a/public/img/iphoneA@2x.png and b/public/img/iphoneA@2x.png differ diff --git a/public/img/winA.png b/public/img/winA.png index b19d985..7395c40 100644 Binary files a/public/img/winA.png and b/public/img/winA.png differ diff --git a/public/img/winA@2x.png b/public/img/winA@2x.png index 638145e..bbe34b3 100644 Binary files a/public/img/winA@2x.png and b/public/img/winA@2x.png differ -- cgit v1.2.3 From 64394b06c07d5009a4c9557822e64f19e06bdef9 Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Tue, 30 Apr 2013 11:45:34 +0200 Subject: Changed icon mouseovers for Divid Home --- public/img/androidA.png | Bin 12586 -> 9055 bytes public/img/androidA@2x.png | Bin 28174 -> 22383 bytes public/img/iphoneA.png | Bin 13721 -> 9785 bytes public/img/iphoneA@2x.png | Bin 35316 -> 27306 bytes public/img/winA.png | Bin 7287 -> 6468 bytes public/img/winA@2x.png | Bin 19201 -> 16853 bytes 6 files changed, 0 insertions(+), 0 deletions(-) (limited to 'public') diff --git a/public/img/androidA.png b/public/img/androidA.png index 910e2a5..afb53f9 100644 Binary files a/public/img/androidA.png and b/public/img/androidA.png differ diff --git a/public/img/androidA@2x.png b/public/img/androidA@2x.png index 9df89ba..204c8d0 100644 Binary files a/public/img/androidA@2x.png and b/public/img/androidA@2x.png differ diff --git a/public/img/iphoneA.png b/public/img/iphoneA.png index bd6956f..0e0399a 100644 Binary files a/public/img/iphoneA.png and b/public/img/iphoneA.png differ diff --git a/public/img/iphoneA@2x.png b/public/img/iphoneA@2x.png index d8e2967..e519291 100644 Binary files a/public/img/iphoneA@2x.png and b/public/img/iphoneA@2x.png differ diff --git a/public/img/winA.png b/public/img/winA.png index 7395c40..62bdb33 100644 Binary files a/public/img/winA.png and b/public/img/winA.png differ diff --git a/public/img/winA@2x.png b/public/img/winA@2x.png index bbe34b3..cdb2313 100644 Binary files a/public/img/winA@2x.png and b/public/img/winA@2x.png differ -- cgit v1.2.3 From 305e189956e8c4834300c8b5b38509590e70be7f Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Tue, 30 Apr 2013 12:16:39 +0200 Subject: changes in divid home and use.less --- public/css/use.less | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'public') diff --git a/public/css/use.less b/public/css/use.less index 329f56d..7512bfb 100644 --- a/public/css/use.less +++ b/public/css/use.less @@ -37,6 +37,7 @@ padding: 5px; } .infobox { + display: inline-block; text-align: center; /*background-color: @grayLighter;*/ @@ -104,6 +105,7 @@ margin-top:45px; .scenario { margin:60px; +text-align: center; } /* @@ -111,12 +113,8 @@ margin:60px; background-color:@grayLighter; }*/ #hva { - height:460px; 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); -- cgit v1.2.3 From a5dc6c364609f9d26d9086cc6f792d8cee934283 Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Tue, 30 Apr 2013 12:34:05 +0200 Subject: changes in use.less --- public/css/use.less | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'public') diff --git a/public/css/use.less b/public/css/use.less index 7512bfb..740818f 100644 --- a/public/css/use.less +++ b/public/css/use.less @@ -1,10 +1,10 @@ /*#wrapper { width:100%; background-position: center 40%; -}*/ +} .content { margin-left: 0px; -} +}*/ .pitch { position: relative; margin-left: 10px; @@ -25,13 +25,11 @@ 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; @@ -77,7 +75,7 @@ margin-top:45px; } .showcase { - height: 460px; + /*height: 460px;*/ margin-top: 40px; margin-bottom: 20px; margin-left: 0px; @@ -113,12 +111,14 @@ text-align: center; background-color:@grayLighter; }*/ #hva { + /*height: 460px;*/ + /*margin: 0 auto;*/ margin-top: 25px; /*border-top: 2px solid #9fd5df;*/ 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; @@ -127,7 +127,7 @@ text-align: center; #dildo {} #hvor { - height:460px; + /*height:460px;*/ margin-top: 25px; /*border-top: 2px solid #9fd5df;*/ @@ -136,13 +136,13 @@ text-align: center; 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;*/ @@ -151,7 +151,7 @@ text-align: center; 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; @@ -168,7 +168,7 @@ text-align: center; 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; -- cgit v1.2.3 From 68503c27b6a4ea3c9dee7d97e64a5792aa26214f Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Tue, 30 Apr 2013 13:01:21 +0200 Subject: Changed img for pairs in divid home --- public/img/fest@2x.png | Bin 4389 -> 0 bytes public/img/par.png | Bin 6545 -> 3453 bytes public/img/par@2x.png | Bin 5110 -> 3900 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 public/img/fest@2x.png (limited to 'public') diff --git a/public/img/fest@2x.png b/public/img/fest@2x.png deleted file mode 100644 index 748ae2f..0000000 Binary files a/public/img/fest@2x.png and /dev/null differ diff --git a/public/img/par.png b/public/img/par.png index 5b9beb2..3637a8e 100644 Binary files a/public/img/par.png and b/public/img/par.png differ diff --git a/public/img/par@2x.png b/public/img/par@2x.png index 1797663..6c15675 100644 Binary files a/public/img/par@2x.png and b/public/img/par@2x.png differ -- cgit v1.2.3 From 9c06210e54b596140f0814da195b5fe37b44a2d2 Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Tue, 30 Apr 2013 13:02:19 +0200 Subject: Added fest@2x.png because of wrong deletion --- public/img/fest@2x.png | Bin 0 -> 4389 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/img/fest@2x.png (limited to 'public') diff --git a/public/img/fest@2x.png b/public/img/fest@2x.png new file mode 100644 index 0000000..748ae2f Binary files /dev/null and b/public/img/fest@2x.png differ -- cgit v1.2.3 From 67172b7b82a2e36b101f371a608abdab7dac91bb Mon Sep 17 00:00:00 2001 From: Erling Aaby Date: Tue, 30 Apr 2013 14:40:30 +0200 Subject: Added img and new sub html contact.ejs --- public/img/dennis.jpg | Bin 0 -> 28716 bytes public/img/erling.jpg | Bin 0 -> 30651 bytes public/img/robert.jpg | Bin 0 -> 29892 bytes public/img/stian.jpg | Bin 0 -> 23693 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/img/dennis.jpg create mode 100644 public/img/erling.jpg create mode 100644 public/img/robert.jpg create mode 100644 public/img/stian.jpg (limited to 'public') diff --git a/public/img/dennis.jpg b/public/img/dennis.jpg new file mode 100644 index 0000000..9e86a1c Binary files /dev/null and b/public/img/dennis.jpg differ diff --git a/public/img/erling.jpg b/public/img/erling.jpg new file mode 100644 index 0000000..97e499e Binary files /dev/null and b/public/img/erling.jpg differ diff --git a/public/img/robert.jpg b/public/img/robert.jpg new file mode 100644 index 0000000..f4c0a69 Binary files /dev/null and b/public/img/robert.jpg differ diff --git a/public/img/stian.jpg b/public/img/stian.jpg new file mode 100644 index 0000000..2b6ce31 Binary files /dev/null and b/public/img/stian.jpg differ -- cgit v1.2.3