Merge branch 'develop': release v2.1v2.1

GitHub: related to #315

1 files changed, 5 insertions, 1 deletions

diff --git a/viewer/src/assets/scss/scrollbar.scss b/viewer/src/assets/scss/scrollbar.scss
index a00b4c2..d40d1a1 100644
--- a/viewer/src/assets/scss/scrollbar.scss
+++ b/viewer/src/assets/scss/scrollbar.scss
@@ -17,12 +17,16 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-@import "~@/assets/scss/theme.scss";
+@import "theme";
 
 // === Scrollbar styling
 
 .scrollbar {
   overflow: auto;
+
+  // enable momentum/kinetic scroll on Safari and Firefox on iOS
+  -webkit-overflow-scrolling: touch;
+
   scrollbar-color: $scrollbar-color transparent;
   scrollbar-width: thin;
   &::-webkit-scrollbar {