From d6ba237d57ae42d4b9fbeef81d1d6ff29c35d3bc Mon Sep 17 00:00:00 2001
From: Torjus <torjusti@gmail.com>
Date: Wed, 1 Aug 2018 14:21:33 +0200
Subject: [PATCH] Add scrollbar when shared files overlap their container

---
 app/stylus/components/FileSharing.styl | 11 +++++++++++
 server/package-lock.json               |  8 ++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/stylus/components/FileSharing.styl b/app/stylus/components/FileSharing.styl
index c5b9bc7..0091133 100644
--- a/app/stylus/components/FileSharing.styl
+++ b/app/stylus/components/FileSharing.styl
@@ -1,4 +1,8 @@
 [data-component='FileSharing'] {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	
 	> .sharing-toolbar {
 		> .share-file {
 			cursor: pointer;
@@ -16,6 +20,9 @@
 	}
 
 	> .shared-files {
+		flex-grow: 1;
+		overflow-y: scroll;
+
 		> .file-entry {
 			background-color: rgba(0,0,0,0.1);
 			border-radius: 5px;
@@ -24,6 +31,10 @@
 			display: flex;
 			margin-top: 0.5rem;
 			
+			&:last-child {
+				margin-bottom: 1.5rem;
+			}
+
 			> .file-avatar {
 				height: 2rem;
 				border-radius: 50%;
diff --git a/server/package-lock.json b/server/package-lock.json
index 897da1e..b534cb7 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -2888,14 +2888,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2915,8 +2913,7 @@
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
@@ -3064,7 +3061,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }