From 90ab42b9bfd0510bee36d7ac688eedf9cb470094 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Fri, 16 Mar 2018 16:10:01 -0400
Subject: [PATCH] Safari uploading progress indicator missing a space

---
 app/assets/javascripts/discourse/templates/composer.hbs | 3 +--
 app/assets/stylesheets/common/base/compose.scss         | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 6f6e32370b6..c1b343af90f 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -121,8 +121,7 @@
 
               {{#if isUploading}}
                 <div id="file-uploading">
-                  {{loading-spinner size="small"}} {{i18n 'upload_selector.uploading'}}
-                  {{uploadProgress}}%
+                  {{loading-spinner size="small"}}<span>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
                   {{#if isCancellable}}
                     <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
                   {{/if}}
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 036fbb02fa0..55133eefb09 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -274,6 +274,7 @@
     }
     #file-uploading {
       display: flex;
+      align-items: center;
       a {
         margin-left: 5px;
         color: $primary-high;