updated animation & donate loop

juzai · Oct 25, 2017 · 7bce805 · 7bce805
1 parent 8af457d
commit 7bce805
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 15 deletions.
diff --git a/cache.manifest b/cache.manifest
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Build: 20171024084748
+# Build: 20171025072741
 
 CACHE:
 resources/fonts/Dressedless_Three.svg

diff --git a/index.html b/index.html
diff --git a/static/app/resources/css/style.css b/static/app/resources/css/style.css
@@ -2,7 +2,7 @@ html, body {
   width: 100%;
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   -webkit-font-smoothing: antialiased;
-  transition: all 350ms ease-in-out; }
+  transition: all 350ms cubic-bezier(0.4, 0, 0.2, 1); }
 
 .fix-break-word, p {
   word-break: break-all;
@@ -122,8 +122,8 @@ html, body {
 /*https://github.com/tobiasahlin/SpinKit*/
 /* spinner */
 .spinner {
-  -webkit-animation: sk-rotateplane 1.2s infinite ease-in-out;
-  animation: sk-rotateplane 1.2s infinite ease-in-out; }
+  -webkit-animation: sk-rotateplane 1.2s infinite cubic-bezier(0.4, 0, 0.2, 1);
+  animation: sk-rotateplane 1.2s infinite cubic-bezier(0.4, 0, 0.2, 1); }
 
 @-webkit-keyframes sk-rotateplane {
   0% {
@@ -250,7 +250,7 @@ html, body {
         transition-delay: 950ms; }
   .main-title h5 {
     max-height: 300px;
-    transition: all 250ms ease-in-out;
+    transition: all 250ms cubic-bezier(0.4, 0, 0.2, 1);
     overflow: hidden; }
     .main-title h5 .label {
       background-color: #71b7fd; }

diff --git a/static/app/scss/_components.scss b/static/app/scss/_components.scss
@@ -10,8 +10,8 @@
 /*https://github.com/tobiasahlin/SpinKit*/
 /* spinner */
 .spinner {
-  -webkit-animation: sk-rotateplane 1.2s infinite ease-in-out;
-  animation: sk-rotateplane 1.2s infinite ease-in-out;
+  -webkit-animation: sk-rotateplane 1.2s infinite cubic-bezier(0.4, 0, 0.2, 1);
+  animation: sk-rotateplane 1.2s infinite cubic-bezier(0.4, 0, 0.2, 1);
 }
 
 @-webkit-keyframes sk-rotateplane {

diff --git a/static/app/scss/_main.scss b/static/app/scss/_main.scss
@@ -53,7 +53,7 @@
   }
   h5 {
     max-height: 300px;
-    transition: all 250ms ease-in-out;
+    transition: all 250ms cubic-bezier(0.4, 0, 0.2, 1);
     overflow: hidden;
 
     .label {

diff --git a/static/app/scss/style.scss b/static/app/scss/style.scss
@@ -2,7 +2,7 @@ html, body {
   width: 100%;
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   -webkit-font-smoothing: antialiased;
-  transition: all 350ms ease-in-out;
+  transition: all 350ms cubic-bezier(0.4, 0, 0.2, 1);
 }
 @import "util.scss";
 @import "animate.scss";

diff --git a/static/app/src/AppBundle.js b/static/app/src/AppBundle.js
@@ -485,6 +485,7 @@ var els = {
   donate: $('.donate'),
   donateTitle: $('.donate .title'),
   noticeLinks: $('.notice-link a'),
+  noticeIndex: 0,
 
   isGithub: /github\.io/g.test(location.href) || Util.localParam()['search']['debug']==1,
   lastVal: ''
@@ -953,8 +954,12 @@ function renderDonate(isZh) {
 }
 
 function renderNotice() {
+  els.noticeIndex += 1;
+  if (els.noticeIndex >= els.noticeLinks.length) {
+    els.noticeIndex = 0;
+  }
   els.noticeLinks.hide();
-  els.noticeLinks.eq(Math.floor(Math.random() * els.noticeLinks.length)).show();
+  els.noticeLinks.eq(els.noticeIndex).show();
   setTimeout(renderNotice, 5 * 1000);
 }
 

diff --git a/static/app/src/view/View.js b/static/app/src/view/View.js
@@ -39,6 +39,7 @@ var els = {
   donate: $('.donate'),
   donateTitle: $('.donate .title'),
   noticeLinks: $('.notice-link a'),
+  noticeIndex: 0,
 
   isGithub: /github\.io/g.test(location.href) || Util.localParam()['search']['debug']==1,
   lastVal: ''
@@ -507,8 +508,12 @@ function renderDonate(isZh) {
 }
 
 function renderNotice() {
+  els.noticeIndex += 1;
+  if (els.noticeIndex >= els.noticeLinks.length) {
+    els.noticeIndex = 0;
+  }
   els.noticeLinks.hide();
-  els.noticeLinks.eq(Math.floor(Math.random() * els.noticeLinks.length)).show();
+  els.noticeLinks.eq(els.noticeIndex).show();
   setTimeout(renderNotice, 5 * 1000);
 }
 

diff --git a/sw.js b/sw.js
@@ -24,7 +24,7 @@
 // cache, then increment the CACHE_VERSION value. It will kick off the service worker update
 // flow and the old cache(s) will be purged as part of the activate event handler when the
 // updated service worker is activated.
-var CACHE_VERSION = 20171024084748;
+var CACHE_VERSION = 20171025072741;
 var CURRENT_CACHES = {
   prefetch: 'prefetch-cache-v' + CACHE_VERSION
 };