aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/home.ejs11
1 files changed, 10 insertions, 1 deletions
diff --git a/views/home.ejs b/views/home.ejs
index 2539f2a..c99c6fb 100644
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -103,10 +103,19 @@
<iframe src="http://player.vimeo.com/video/41974181" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
</div>
</div>
- <div class="span5 sectionright">
+<<<<<<< HEAD
+ <div class="span5 sectionright">
+ <a href="https://itunes.apple.com/us/genre/ios-finance/id6015?mt=8" title="Appstore">
+ <div id="app" class="apple"> <img src="/img/iph.png" class="apple">
+ </a>
+ <a href="https://play.google.com/store"><img src="/img/android.png" id="android" class="infoimg"></a>
+ <a href="http://www.windowsphone.com/nb-no/store"><img src="/img/win.png" id="windows" class="infoimg"></a>
+=======
+ <div class="span5 sectionright">
<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>
+>>>>>>> a935f29043c48063839c5f139dbbde6817b213f6
</div>
</div>
</div>