Fix back-to-top button and remove some scroll jank.

cakephp · May 28, 2016 · 027ded8 · 027ded8
1 parent d7994b9
commit 027ded8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/themes/cakephp/static/app.js b/themes/cakephp/static/app.js
@@ -16,16 +16,18 @@ App.Book = (function() {
       doc = $(document),
       offset = contents.offset(),
       sidebarHeight = contents.height(),
+      delay = 150,
+      didScroll = false;
       showing = false;
 
     var positionBackToTop = function() {
+      setTimeout(positionBackToTop, delay);
       if (offset === undefined) {
         return;
       }
       if (!showing && doc.scrollTop() > offset.top + sidebarHeight) {
         showing = true;
         backToTop.css({
-          position: 'fixed',
           top: 50,
           left: 20,
           display:' block'
@@ -37,14 +39,15 @@ App.Book = (function() {
         });
       }
     };
+    setTimeout(positionBackToTop, delay);
 
     backToTop.bind('click', function(evt) {
-      $('html,body').animate({scrollTop: offset.top}, 200);
+      $('html,body').animate({scrollTop: 0}, 200);
       return false;
     });
 
     doc.bind('scroll', function() {
-      positionBackToTop();
+      didScroll = true;
     });
 
     // Tooltips

diff --git a/themes/cakephp/static/css/default.css b/themes/cakephp/static/css/default.css
@@ -146,13 +146,21 @@ dl.docutils {
     cursor: pointer;
 }
 
+/* -- back to top -- */
+#back-to-contents {
+    display: block;
+    position: fixed;
+    background: #fff;
+}
 /* -- Page Contents -- */
 .page-contents {
-    background: rgba(189, 189, 181, 0.32);
+    background: #eaeae7;
     float: right;
     padding: 2em;
     margin-left: 2em;
     margin-bottom: 1em;
+    position: relative;
+    z-index: 1;
 }
 .page-contents h3 {
     font-size: 1em;