resolve conflicts

.eslintignore

@@ -3,6 +3,7 @@
 app/assets/v2/js/event_ethdenver2019/blockies.js
 app/assets/v2/js/lib/*
 app/assets/v2/js/abi.js
+app/assets/landingpage/*
 
 app/assets/onepager/js/confetti.js
 

app/app/urls.py

@@ -414,6 +414,7 @@
     re_path(r'^modal/extend_issue_deadline/?', dashboard.views.extend_issue_deadline, name='extend_issue_deadline'),
 
     # brochureware views
+    re_path(r'^homeold/?$', retail.views.index_old, name='homeold'),
     re_path(r'^home/?$', retail.views.index, name='home'),
     re_path(r'^landing/?$', retail.views.index, name='landing'),
     re_path(r'^about/?', retail.views.about, name='about'),
@@ -471,6 +472,7 @@
     re_path(r'^reddit/?', retail.views.reddit, name='reddit'),
     re_path(r'^livestream/?', retail.views.livestream, name='livestream'),
     re_path(r'^feedback/?', retail.views.feedback, name='feedback'),
+    re_path(r'^telegram/?', retail.views.telegram, name='telegram'),
     re_path(r'^twitter/?', retail.views.twitter, name='twitter'),
     re_path(r'^wallpaper/?', retail.views.wallpaper, name='wallpaper'),
     re_path(r'^wallpapers/?', retail.views.wallpaper, name='wallpapers'),
@@ -644,6 +646,7 @@
     re_path(r'^_administration/email/match_distribution$', retail.emails.match_distribution, name='match_distribution'),
 
     # settings
+    re_path(r'^static_proxy/(.*)', marketing.views.static_proxy, name='static_proxy'),
     re_path(r'^settings/email/(.*)', marketing.views.email_settings, name='email_settings'),
     re_path(r'^settings/privacy/?', marketing.views.privacy_settings, name='privacy_settings'),
     re_path(r'^settings/matching/?', marketing.views.matching_settings, name='matching_settings'),

app/assets/landingpage/animation_floating.scss

@@ -0,0 +1,20 @@
+
+.floating{
+	animation: floating 3s ease-in-out infinite;
+}
+
+.floating2{
+	animation: floating2 3s ease-in-out infinite;
+}
+
+@keyframes floating { 
+    0% { transform: translate(0,  0px); } 
+    50%  { transform: translate(0, 15px); } 
+    100%   { transform: translate(0, 0px); }     
+} 
+
+@keyframes floating2 { 
+    0% { transform: translate(0,  15px); } 
+    50%  { transform: translate(0, 0px); } 
+    100%   { transform: translate(0, 15px); }     
+} 

app/assets/landingpage/animations.js

@@ -0,0 +1,112 @@
+$(document).ready(function(){
+
+	// add on each h1, h2, p, button 
+	// some sal data attributes
+	// to fade in all elements with some delay
+
+	$( "h1" ).each(function( index) {
+	  	$(this).attr('data-sal', 'zoom-in');
+	  	$(this).attr('data-sal-delay', '0');
+	  	$(this).attr('data-sal-duration', '300');
+	});
+
+	$( "h2" ).each(function( index) {
+	  	$(this).attr('data-sal', 'zoom-in');
+	  	$(this).attr('data-sal-delay', '100');
+	  	$(this).attr('data-sal-duration', '400');
+	});
+
+	$( "p" ).each(function( index) {
+	  	$(this).attr('data-sal', 'zoom-in');
+	  	$(this).attr('data-sal-delay', '200');
+	  	$(this).attr('data-sal-duration', '500');
+	});
+
+	$( "a.btn" ).each(function( index) {
+	  	$(this).attr('data-sal', 'zoom-in');
+	  	$(this).attr('data-sal-delay', '300');
+	  	$(this).attr('data-sal-duration', '600');
+	});
+
+	$( "figure" ).each(function( index) {
+	  	$(this).attr('data-sal', 'fade');
+	  	$(this).attr('data-sal-delay', '100');
+	  	$(this).attr('data-sal-duration', '700');
+	});
+
+	x = 100;
+	$( "#twitter figure" ).each(function( index) {
+		x = x + 100;
+	  	$(this).attr('data-sal', 'zoom-in');
+	  	$(this).attr('data-sal-delay', x);
+	  	$(this).attr('data-sal-duration', '500');
+	});
+
+	x = 100;
+	$( "#partners figure" ).each(function( index) {
+
+		x = x + 100;
+	  	$(this).attr('data-sal', 'zoom-in');
+	  	$(this).attr('data-sal-delay', x);
+	  	$(this).attr('data-sal-duration', '500');
+	});
+
+
+	x = 100;
+	$( "#footersocial figure" ).each(function( index) {
+
+		x = x + 100;
+	  	$(this).attr('data-sal', 'zoom-in');
+	  	$(this).attr('data-sal-delay', x);
+	  	$(this).attr('data-sal-duration', '500');
+	});
+
+
+
+	// init sal ( observer based animation framework )
+
+	sal({
+	  threshold: 0.3,
+	  once: false
+	});
+
+
+
+
+	// custom scroll based behaviours
+	// do not know how to do this with observer
+	// so i do classic style ...
+
+	$(window).scroll(function() {
+
+		// current height of page
+	    var height = $(window).scrollTop();
+
+	    // y1 = a bit when whatisgitcoin section starts - then dim town down
+		y1 = $('#whatisgitcoin').offset().top / 2;
+
+		// y2 = a bit when fotter navigation is in view - then bring back full opacity to town
+		y2 = $('#footernavigation').offset().top - 500;
+
+		// console.log("currentheight:" + height + " dim-start:" + y1 + " dim-end:" + y2);
+
+	    if(height  > y1 && height < y2 ) {
+	        $( "#town" ).addClass("dim");
+	        $( "#fixed-signup-button" ).addClass("show");
+
+	    }
+	    else{
+	    	$( "#town" ).removeClass("dim");
+	    	$( "#fixed-signup-button" ).removeClass("show");
+	    }
+
+
+	});
+
+
+
+});
+
+
+
+