From 9045d1a8de83b0e67311066d28f49d2bd2604159 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mlorber@biosistemika.com>
Date: Sun, 22 Mar 2020 17:47:13 +0100
Subject: [PATCH] Fix tooltips appear wrongly

---
 app/assets/stylesheets/marvinjs.scss          |  2 +-
 .../stylesheets/my_modules/results/index.scss | 14 ++---
 .../wopi/_create_wopi_file_button.html.erb    |  2 +-
 app/views/my_modules/results.html.erb         | 62 +++++++++----------
 4 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/app/assets/stylesheets/marvinjs.scss b/app/assets/stylesheets/marvinjs.scss
index 918b8016a..319d100ed 100644
--- a/app/assets/stylesheets/marvinjs.scss
+++ b/app/assets/stylesheets/marvinjs.scss
@@ -140,7 +140,7 @@
 }
 
 .new-marvinjs-upload-button {
-  padding: 2px 16px;
+  padding: 1px 16px !important;
 
   .new-marvinjs-upload-icon {
     display: inline-block;
diff --git a/app/assets/stylesheets/my_modules/results/index.scss b/app/assets/stylesheets/my_modules/results/index.scss
index 5d8714ee0..a5c9e84b4 100644
--- a/app/assets/stylesheets/my_modules/results/index.scss
+++ b/app/assets/stylesheets/my_modules/results/index.scss
@@ -7,15 +7,15 @@
 @import "mixins";
 
 #results-toolbar {
-  .help_tooltips {
+  .add-result-toolbar {
     align-items: center;
     display: flex;
+  }
 
-    .add-result-text {
-      display: inline-block;
-      line-height: 36px;
-      margin-bottom: 5px;
-      margin-right: 5px;
-    }
+  .add-result-text {
+    display: inline-block;
+    line-height: 36px;
+    margin-bottom: 5px;
+    margin-right: 5px;
   }
 }
diff --git a/app/views/assets/wopi/_create_wopi_file_button.html.erb b/app/views/assets/wopi/_create_wopi_file_button.html.erb
index c851a3091..bf8fb53a5 100644
--- a/app/views/assets/wopi/_create_wopi_file_button.html.erb
+++ b/app/views/assets/wopi/_create_wopi_file_button.html.erb
@@ -4,7 +4,7 @@
               target: '_blank',
               title: 'Create_new_file',
               data: { 'id': element_id, 'type': element_type, } do %>
-    <span class="btn btn-light new-asset-upload-button">
+    <span class="new-asset-upload-button">
       <%= image_tag 'office/office.svg' %>
       <%=t 'assets.create_wopi_file.button_text' %>
     </span>
diff --git a/app/views/my_modules/results.html.erb b/app/views/my_modules/results.html.erb
index 074a4f596..4263875d0 100644
--- a/app/views/my_modules/results.html.erb
+++ b/app/views/my_modules/results.html.erb
@@ -16,38 +16,38 @@
     </div>
 
     <% if can_manage_module?(@my_module) %>
-      <div class="help_tooltips"
-           data-tooltiplink="<%= I18n.t('tooltips.link.task.results') %>"
-           data-tooltipcontent="<%= I18n.t('tooltips.text.task.results') %>">
-      <span class="hidden-xs add-result-text"><%= t'my_modules.results.add_label' %></span>
-      <div class="sci-btn-group">
-        <a class="btn btn-primary"
-           id="new-result-text"
-           data-href="<%= new_my_module_result_text_path(my_module_id: @my_module.id) %>"
-           href="#">
-          <span class="fas fa-font"></span>
-          <span class="hidden-xs"><%= t("my_modules.results.new_text_result") %></span>
-        </a>
-        <a class="btn btn-primary"
-           id="new-result-table"
-           data-href="<%= new_my_module_result_table_path(my_module_id: @my_module.id) %>"
-           href="#">
-          <span class="fas fa-table"></span>
-          <span class="hidden-xs"><%= t("my_modules.results.new_table_result") %></span>
-        </a>
-        <a class="btn btn-primary"
-           id="new-result-asset"
-           data-href="<%= new_my_module_result_asset_path(my_module_id: @my_module.id) %>"
-           href="#">
-          <span class="fas fa-paperclip"></span>
-          <span class="hidden-xs"><%= t("my_modules.results.new_asset_result") %></span>
-        </a>
-        <%= render partial: '/assets/marvinjs/create_marvin_sketch_button.html.erb',
-                     locals: {  element_id: @my_module.id, element_type: 'Result',  sketch_container: "#results[data-module-id=#{@my_module.id}]" } %>
-        <%= render partial: "assets/wopi/create_wopi_file_button",
-                   locals: {  element_id: @my_module.id, element_type: 'Result' } %>
+      <div class="add-result-toolbar">
+        <span class="hidden-xs add-result-text"><%= t'my_modules.results.add_label' %></span>
+        <div class="sci-btn-group help_tooltips"
+             data-tooltiplink="<%= I18n.t('tooltips.link.task.results') %>"
+             data-tooltipcontent="<%= I18n.t('tooltips.text.task.results') %>">
+          <a class="btn btn-primary"
+             id="new-result-text"
+             data-href="<%= new_my_module_result_text_path(my_module_id: @my_module.id) %>"
+             href="#">
+            <span class="fas fa-font"></span>
+            <span class="hidden-xs"><%= t("my_modules.results.new_text_result") %></span>
+          </a>
+          <a class="btn btn-primary"
+             id="new-result-table"
+             data-href="<%= new_my_module_result_table_path(my_module_id: @my_module.id) %>"
+             href="#">
+            <span class="fas fa-table"></span>
+            <span class="hidden-xs"><%= t("my_modules.results.new_table_result") %></span>
+          </a>
+          <a class="btn btn-primary"
+             id="new-result-asset"
+             data-href="<%= new_my_module_result_asset_path(my_module_id: @my_module.id) %>"
+             href="#">
+            <span class="fas fa-paperclip"></span>
+            <span class="hidden-xs"><%= t("my_modules.results.new_asset_result") %></span>
+          </a>
+          <%= render partial: '/assets/marvinjs/create_marvin_sketch_button.html.erb',
+                       locals: {  element_id: @my_module.id, element_type: 'Result',  sketch_container: "#results[data-module-id=#{@my_module.id}]" } %>
+          <%= render partial: "assets/wopi/create_wopi_file_button",
+                     locals: {  element_id: @my_module.id, element_type: 'Result' } %>
+        </div>
       </div>
-    </div>
     <% end %>
   </div>