those changes got lost while rebasing, displays loading message below the annotation pins to prevent a jumping effect

2 files changed, 10 insertions, 4 deletions

diff --git a/plugins/Annotations/javascripts/annotations.js b/plugins/Annotations/javascripts/annotations.js
index 9c8cbdad1f..8ab218ef22 100755
--- a/plugins/Annotations/javascripts/annotations.js
+++ b/plugins/Annotations/javascripts/annotations.js
@@ -519,6 +519,12 @@
 
             loadingAnnotationManager = true;
 
+            var isDashboard = !!$('#dashboardWidgetsArea').length;
+
+            if (isDashboard) {
+                $('.loadingPiwikBelow', domElem).insertAfter($('.evolution-annotations', domElem));
+            }
+
             var loading = $('.loadingPiwikBelow', domElem).css({display: 'block'});
 
             // the annotations for this report have not been retrieved yet, so do an ajax request
@@ -539,7 +545,7 @@
                 loading.css('visibility', 'hidden');
 
                 // add & show annotation manager
-                if ($('#dashboardWidgetsArea').length) {
+                if (isDashboard) {
                     manager.insertAfter($('.evolution-annotations', domElem));
                 } else {
                     $('.dataTableFeatures', domElem).append(manager);
diff --git a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
index 992ea0573e..6cdcea04ca 100644
--- a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
+++ b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
@@ -312,7 +312,7 @@ table.dataTable img {
   -moz-border-radius-bottomleft: 10px;
   border-bottom-right-radius: 10px;
   border-bottom-left-radius: 10px;
-  line-height: 1px;
+  line-height: 0px;
   height: 4px;
   width: 70px;
 
@@ -345,11 +345,11 @@ table.dataTable img {
   -moz-border-radius-topright: 10px;
   border-top-left-radius: 10px;
   border-top-right-radius: 10px;
-  line-height: 1px;
+  line-height: 0px;
 
   img {
     margin-bottom: -2px;
-    line-height: 1px;
+    line-height: 0px;
   }
 }