From 5286c57e94c672551263dea802dc3dff339e91f6 Mon Sep 17 00:00:00 2001
From: Joe Sitton <sittonjoe@gmail.com>
Date: Tue, 14 Nov 2017 17:53:30 -0500
Subject: [PATCH] fix some isues in the progress bar

---
 .../client/imports/general/base_old.css            |  9 +++++++++
 packages/rocketchat-ui/client/views/app/room.html  | 14 +++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 59c9a35863c..329bbb2af25 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -2246,9 +2246,15 @@
 			right: 0;
 			left: 0;
 
+			overflow: hidden;
+
+			width: 50%;
+
 			height: 100%;
 			padding: 0 10px;
 
+			text-overflow: ellipsis;
+
 			& > a {
 				float: right;
 
@@ -2258,6 +2264,9 @@
 		}
 
 		& button {
+			position: relative;
+			z-index: 3;
+
 			float: right;
 
 			text-transform: uppercase;
diff --git a/packages/rocketchat-ui/client/views/app/room.html b/packages/rocketchat-ui/client/views/app/room.html
index c32d010129d..f1c64b6cb13 100644
--- a/packages/rocketchat-ui/client/views/app/room.html
+++ b/packages/rocketchat-ui/client/views/app/room.html
@@ -79,18 +79,18 @@
 									{{#if error}}
 										<div class="upload-progress-text">
 											{{error}}
-											<button>
-												{{_ "close"}}
-											</button>
 										</div>
+										<button>
+											{{_ "close"}}
+										</button>
 									{{else}}
 										<div class="upload-progress-progress" style="width: {{percentage}}%;"></div>
 										<div class="upload-progress-text">
-											{{name}}... {{percentage}}%
-											<button>
-												{{_ "Cancel"}}
-											</button>
+											[{{percentage}}%] {{name}}
 										</div>
+										<button>
+											{{_ "Cancel"}}
+										</button>
 									{{/if}}
 								</div>
 							{{/each}}