From a3932cc67f856548903fb4775c582e0a34fb1ef3 Mon Sep 17 00:00:00 2001
From: Urban Rotnik <urban.rotnik@gmail.com>
Date: Thu, 4 Apr 2019 18:15:30 +0200
Subject: [PATCH] New asset box style update

---
 app/assets/stylesheets/my_modules.scss     |  2 +-
 app/assets/stylesheets/themes/scinote.scss | 10 ++++++++++
 app/views/result_assets/_new.html.erb      |  4 ++--
 app/views/steps/_empty_step.html.erb       |  4 ++--
 config/locales/en.yml                      |  4 ++--
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/my_modules.scss b/app/assets/stylesheets/my_modules.scss
index 3f2f89015..f38ebdedf 100644
--- a/app/assets/stylesheets/my_modules.scss
+++ b/app/assets/stylesheets/my_modules.scss
@@ -54,7 +54,7 @@
 
   img {
     margin-right: 5px;
-    width: 32px;
+    width: 23px;
   }
 }
 
diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index b0793a5b6..e6443d3b1 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -1041,6 +1041,16 @@ ul.content-activities {
   margin-top: 20px;
   padding-bottom: 30px;
   padding-top: 30px;
+  background-color: $color-concrete;
+
+  .new-asset-upload-icon{
+    margin-right: 6px;
+  }
+
+  .new-asset-upload-button {
+    margin-left: 20px;
+    background-color: inherit;
+  }
 }
 
 .dnd-error,
diff --git a/app/views/result_assets/_new.html.erb b/app/views/result_assets/_new.html.erb
index 786a18d53..ff3fd984b 100644
--- a/app/views/result_assets/_new.html.erb
+++ b/app/views/result_assets/_new.html.erb
@@ -5,8 +5,8 @@
           data-tooltipcontent="<%= I18n.t('tooltips.text.protocol.step_add_files') %>">
     <%=t 'assets.drag_n_drop.label_html' %>
     <label>
-      <span class="btn btn-primary">
-        <span class="fas fa-plus"></span>
+      <span class="btn btn-default new-asset-upload-button">
+        <span class="fas fa-file-upload new-asset-upload-icon"></span>
         <%=t 'assets.drag_n_drop.browse_label' %>
       </span>
       <input type="file"
diff --git a/app/views/steps/_empty_step.html.erb b/app/views/steps/_empty_step.html.erb
index 62a4156cc..ee97d2f0f 100644
--- a/app/views/steps/_empty_step.html.erb
+++ b/app/views/steps/_empty_step.html.erb
@@ -48,8 +48,8 @@
             data-tooltipcontent="<%= I18n.t('tooltips.text.protocol.step_add_files') %>">
       <%=t 'assets.drag_n_drop.label_html' %>
       <label>
-        <span class="btn btn-primary">
-          <span class="fas fa-plus"></span>
+        <span class="btn btn-default new-asset-upload-button">
+          <span class="fas fa-file-upload new-asset-upload-icon"></span>
           <%=t 'assets.drag_n_drop.browse_label' %>
         </span>
         <input type="file"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 63c850e95..c61f83566 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1874,8 +1874,8 @@ en:
       edit: "SciNote | %{file_name} | Edit"
       view: "SciNote | %{file_name} | View"
     drag_n_drop:
-      label_html: 'Drag &amp; drop files here, CTRL+V (for images from clipboard) or '
-      browse_label: 'Browse to add'
+      label_html: 'Drag &amp; drop here. Copy &amp Paste images.'
+      browse_label: 'Select to Upload...'
       drop_label: 'Drop to add to Step'
       file_label: 'File'
     from_clipboard: