From 27d7668600bb5e3d7b47b97d5cc2abc11bb7136b Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 3 May 2018 11:39:59 -0400
Subject: take off scroll sista, other fixes

---
 www/templates/montage.html  | 2 +-
 www/templates/timeline.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/montage.html b/www/templates/montage.html
index 6a877936..d434de84 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -24,7 +24,7 @@
         </button>
     </ion-nav-buttons>
     <ion-content ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" overflow-scroll="false">
-    <!--<ion-content scroll-sista ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" overflow-scroll="false">-->
+   
       <div ng-if="areImagesLoading" class="screen-note">&nbsp;{{ 'kArrangingImages' | translate }}...&nbsp;</div>
           
       
diff --git a/www/templates/timeline.html b/www/templates/timeline.html
index 87785fe8..80f83e8a 100644
--- a/www/templates/timeline.html
+++ b/www/templates/timeline.html
@@ -17,7 +17,7 @@
         <button class="button button-icon button-clear ion-log-out" ng-click="zoom(0.2)"></button>&nbsp;-->
     </ion-nav-buttons>
     <!--<ion-content data-tap-disabled="true">-->
-    <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
+    <ion-content delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
       <div style="padding-left:15px; font-size:10px; color:grey">
         {{prettify(fromDate)}} - {{prettify(toDate)}} &nbsp;{{tzAbbr}}&nbsp; ({{'kTimelineOnlyDisplaying1' | translate:translationData}})
         <strong>
-- 
cgit v1.2.3