From 8b61ac1403335ff28af71ee31ed05c68f3f4b26b Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Sat, 15 Nov 2014 13:59:05 +0100
Subject: [PATCH] Try to improved logo upload.

---
 app/assets/javascripts/app/views/layout_ref/setup.jst.eco | 8 ++++++--
 app/assets/stylesheets/zammad.css.scss                    | 8 +++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/app/views/layout_ref/setup.jst.eco b/app/assets/javascripts/app/views/layout_ref/setup.jst.eco
index 4040b9963..aa2f6c84e 100644
--- a/app/assets/javascripts/app/views/layout_ref/setup.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/setup.jst.eco
@@ -56,8 +56,12 @@
           <div class="form-group">
             <label>Logo</label>
             <div class="horizontal center">
-              <img class="fileUpload-preview" src="">
-              <div class="btn btn--success fileUpload">Upload<input type="file" class="js-upload" accept="image/*"></div>
+              <div class="flex fileUpload-placeholder">
+                <img class="fileUpload-preview" src="">
+              </div>
+              <div class="flex">
+                <div class="btn btn--success fileUpload"><%- @T('Upload') %><input type="file" class="js-upload" accept="image/*"></div>
+              </div>
             </div>
           </div>
           <div class="form-group">
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index e41874b0f..a04187dc3 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -4195,8 +4195,14 @@ label + .wizard-buttonList {
   }
 }
 
+.setup.wizard .fileUpload-placeholder {
+  border: dotted 1px #eee;
+  height: 100px;
+}
+
 .setup.wizard .fileUpload-preview {
-  height: 36px;
+  max-height: 100px;
+  max-width: 180px;
 }
 
 .setup.wizard .fileUpload-preview:not([src=""]) + .fileUpload {