Merge branch 'master' of https://github.com/friendica/red

1 files changed, 19 insertions, 13 deletions

diff --git a/assets/home.html b/assets/home.html
index 4e8c9d67a..32583ed7f 100644
--- a/assets/home.html
+++ b/assets/home.html
@@ -46,7 +46,7 @@ var terms = new Array(
 "Cloud Storage",
 "Own Your Content",
 "Blogging",
-"Decent Encryption",
+"End-to-end Encryption",
 "Chatrooms",
 "Shareable Apps",
 "Cross-Site Access Control",
@@ -92,8 +92,8 @@ var r = 0;
 var g = 0;
 var b = 0;
 
-var speed = 5;
-var delay = 250;
+var speed = 3;
+var delay = 450;
 
 var timer = null;
 var holdid = 0;
@@ -101,15 +101,20 @@ var element = 'word-flasher';
 var custom = '';
 var seq = 0;
 var nindex = 0;
-
+var firstTime = 1;
 var curr = null;
 
 function update_element() {
 
+	if(firstTime) {
+		firstTime = 0;
+		fadeout();
+		return;
+	}
 	curr = terms[nindex];
 	nindex ++;
 	if(terms[nindex] == null)
-		nindex = 0
+		nindex = 0;
 
 	var id = document.getElementById(element);
 	id.innerHTML = curr;
@@ -126,8 +131,10 @@ function fadeout() {
   if((r != 255) && (g != 255) && (b != 255)) {
     timer = setTimeout('fadeout();',5);
   }
-  else
-    update_element();
+  else {
+	    update_element();
+  }
+
   id.style.color = "rgb(" + r + "," + g + "," + b + ")";
 }
 
@@ -149,8 +156,7 @@ function fadein() {
 
 
 $(document).ready(function() {
-	update_element();
-	$('.cb').colorbox({width: '50%',inline: true,href:"#farmer"});
+	timer = setTimeout('update_element();',2000);
 });
 
 
@@ -161,9 +167,9 @@ $(document).ready(function() {
 
 <center>
 <img style="width: 450px; margin-top: 30px; margin-bottom: 30px;" src="assets/hashlogo.png" >
-<div id="word-flasher" style="font-size: 3.0em; font-weight: bold; margin-bottom: 30px;">RedMatrix</div>
+<div id="word-flasher" style="font-size: 3.0em; font-weight: bold; margin-bottom: 30px;">&quot;The Network&quot;</div>
 <div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;">
-The RedMatrix (aka "<span style="color: red;">red</span>") is an open source webapp providing a complete <strong>decentralised</strong> publishing, sharing, and communications system. It combines communications (private messaging, chat and social networking), and media management (photos, events, files, web pages, shareable apps) with enough features to make your head spin.
+The RedMatrix (aka "<span style="color: #c60032;">red</span>") is an open source webapp providing a complete <strong>decentralised</strong> publishing, sharing, and communications system. It combines communications (private messaging, chat and social networking), and media management (photos, events, files, web pages, shareable apps) with enough features to make your head spin.
 </div>
 <br />
 <div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;">
@@ -179,8 +185,8 @@ For the average person, the biggest advantage of decentralised identity is that
 </div>
 <br />
 
-<div style="margin-top: 15px; margin-bottom: 15px; color: #808080; font-size: 1.8em;">Welcome to the matrix. Welcome to <span style="color: red;">red</span>.</div>
-<div style="font-size: 1.4em;"><a href="pubsites" style="color: white; padding:10px; background-color: red; border-radius: 10px;">Sign up now!</a></div>
+<div style="margin-top: 15px; margin-bottom: 15px; color: #808080; font-size: 1.8em;">Welcome to the matrix. Welcome to <span style="color: #c60032;"><strong>red</strong></span>.</div>
+<div style="font-size: 1.4em;"><a href="pubsites" style="color: white; padding:10px; background-color: #c60032; border-radius: 10px;">Sign up now!</a></div>
 
 
 <div style="margin-top: 15px; margin-bottom: 15px;"><a href="pubsites">Public Sites</a> | <a href="https://redmatrix.me">Project Home</a> | <a href="https://github.com/friendica/red">Code</a> | <a href="https://zothub.com/channel/one">Developers</a></div></center>