Merge branch 'feature/firefox-#63' into develop

kilianc · Jul 16, 2015 · 1234c9f · 1234c9f
2 parents e55bd73 + 27f714f
commit 1234c9f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/app.ejs b/app/app.ejs
@@ -155,18 +155,18 @@ angular
       if (!ctrl.paused) return
       ctrl.paused = false
       ctrl.socket.emit('select stream', ctrl.activeStream)
-      $streamLines.on('mousewheel', ctrl.pause)
+      $streamLines.on('wheel', ctrl.pause)
     }
 
     ctrl.pause = function pause() {
       if (ctrl.paused) return
       ctrl.paused = true
       ctrl.socket.emit('select stream')
-      $streamLines.off('mousewheel', ctrl.pause)
+      $streamLines.off('wheel', ctrl.pause)
       $scope.$apply()
     }
 
-    $streamLines.on('mousewheel', ctrl.pause)
+    $streamLines.on('wheel', ctrl.pause)
 
     /*!
      * settings and preferences

diff --git a/app/scss/main.scss b/app/scss/main.scss
@@ -53,7 +53,7 @@ body {
   flex-direction: column;
   font-family: $font-family;
   font-size: 16px;
-  min-height: 100vh;
+  height: 100vh;
 
   &.resizing {
     user-select: none;
@@ -94,6 +94,7 @@ header {
   display: flex;
   flex: 1;
   flex-direction: row;
+  min-height: 0;
 }
 
 .sidebar {
@@ -181,6 +182,7 @@ header {
   display: flex;
   flex: 1;
   flex-direction: column;
+  min-width: 0;
 
   .stream-header {
     align-items: center;
@@ -225,7 +227,7 @@ header {
     flex: 1;
     font-size: 12px;
     height: 0;
-    overflow-y: auto;
+    overflow: auto;
     padding: 2px 0;
 
     .stream-line {