Merge pull request #836 from swarmcity/sc-nightly

State of testing site
swarmcity · Oct 3, 2018 · d8b4b15 · d8b4b15
2 parents cb2f560 + e156163
commit d8b4b15
Show file tree

Hide file tree

Showing 15 changed files with 898 additions and 735 deletions.
diff --git a/src/displays/display-backup.html b/src/displays/display-backup.html
diff --git a/src/displays/display-complete-reply.html b/src/displays/display-complete-reply.html
@@ -150,7 +150,9 @@
             */
             _replyToIpfs() {
                 if (this.privateKey) {
-                    this.hashtagItem.replies = this.hashtagItem.replies || {};
+                    if (!this.hashtagItem.replies) {
+                        this.hashtagItem.replies = {};
+                    }
                     this.hashtagItem.replies[this.address] = {
                         address: this.address,
                         avatarHash: this.avatarHash,

diff --git a/src/displays/display-hashtag-simpledeal.html b/src/displays/display-hashtag-simpledeal.html
@@ -48,13 +48,15 @@
                 background-image: var(--sc-bg);
                 z-index: 99;
                 position: sticky;
+                position: -webkit-sticky;
                 top: 158px;
                 width: 100%;
                 box-sizing: border-box;
                 padding: 0px 36px 15px 36px;
             }
 
             .container[wide-layout] .middle {
+                position: -webkit-sticky;
                 position: sticky;
                 top: 172px;
                 padding: 0px 0 10px 10vw;
@@ -201,7 +203,13 @@
                 opacity: 0.15;
             }
 
-
+            @media only screen and (-webkit-min-device-pixel-ratio: 1.5),
+            only screen and (min--moz-device-pixel-ratio: 1.5),
+            only screen and (min-resolution: 240dpi) {
+                .icon-scroll {
+                    @apply --retina;
+                }
+            }
 
         </style>
         <iron-media-query query="(min-width: 600px)" query-matches="{{wide}}"></iron-media-query>
@@ -364,11 +372,11 @@
             * takes the user back to the top of the page
             */
             _backToTop() {
-                let scrollDuration = 500;
-                let scrollStep = -window.scrollY / (scrollDuration / 15);
+                let scrollDuration = 250;
+                let scrollStep = -this.parentElement.scrollTop / (scrollDuration / 15);
                 let scrollInterval = setInterval(() => {
-                    if (window.scrollY != 0) {
-                        window.scrollBy(0, scrollStep);
+                    if (this.parentElement.scrollTop != 0) {
+                        this.parentElement.scrollTop += scrollStep;
                     }
                     else clearInterval(scrollInterval);
                 },