From 933bd77658daa3ed3df52086b2fb2370dfa46d8a Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Wed, 13 Mar 2019 17:16:24 +0300
Subject: [PATCH] =?UTF-8?q?don=E2=80=99t=20render=20close=20button=20in=20?=
 =?UTF-8?q?inline=20mode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/src/components/Dashboard.js      | 18 +++++++++++-------
 packages/@uppy/dashboard/src/style.scss        |  9 ++-------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/packages/@uppy/dashboard/src/components/Dashboard.js b/packages/@uppy/dashboard/src/components/Dashboard.js
index 6be5e600a..1ef52312b 100644
--- a/packages/@uppy/dashboard/src/components/Dashboard.js
+++ b/packages/@uppy/dashboard/src/components/Dashboard.js
@@ -53,13 +53,17 @@ module.exports = function Dashboard (props) {
           width: props.inline && props.width ? props.width : '',
           height: props.inline && props.height ? props.height : ''
         }}>
-        <button class="uppy-Dashboard-close"
-          type="button"
-          aria-label={props.i18n('closeModal')}
-          title={props.i18n('closeModal')}
-          onclick={props.closeModal}>
-          <span aria-hidden="true">&times;</span>
-        </button>
+
+        {!props.inline
+          ? <button class="uppy-u-reset uppy-Dashboard-close"
+            type="button"
+            aria-label={props.i18n('closeModal')}
+            title={props.i18n('closeModal')}
+            onclick={props.closeModal}>
+            <span aria-hidden="true">&times;</span>
+          </button>
+            : null
+          }
 
         <div class="uppy-Dashboard-innerWrap">
           { (!noFiles && props.showSelectedFiles) && <PanelTopBar {...props} /> }
diff --git a/packages/@uppy/dashboard/src/style.scss b/packages/@uppy/dashboard/src/style.scss
index 8280b1780..9c4fde280 100644
--- a/packages/@uppy/dashboard/src/style.scss
+++ b/packages/@uppy/dashboard/src/style.scss
@@ -162,25 +162,20 @@
 }
 
 .uppy-Dashboard-close {
-  @include reset-button;
-  display: none;
+  display: block;
   position: absolute;
   top: -33px;
   right: -2px;
   cursor: pointer;
   color: rgba($color-white, 0.9);
   font-size: 27px;
+  z-index: $zIndex-5;
 
   @media #{$screen-medium} {
     font-size: 35px;
     top: -10px;
     right: -35px;
   }
-
-  .uppy-Dashboard--modal & {
-    z-index: $zIndex-5;
-    display: block;
-  }
 }
 
 .uppy-DashboarAddFiles {