diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2014-05-09 01:25:07 +0400 |
---|---|---|
committer | Thomas Steur <tsteur@users.noreply.github.com> | 2014-05-09 01:25:07 +0400 |
commit | 89d9003bba0c382e842f536551fb5d3246fb89d0 (patch) | |
tree | b9b0385318e769d512eef5f6568477304f5fcf90 /plugins/Annotations | |
parent | f5ba79b389d85c49abbf17accb41a33904060d36 (diff) | |
parent | 8be3ec3321cb356088b010c7b0f2845ee983cefa (diff) |
Merge pull request #269 from piwik/4987_zenmode
refs #4987 Simplify Piwik interface: Zen Mode
Diffstat (limited to 'plugins/Annotations')
-rwxr-xr-x | plugins/Annotations/javascripts/annotations.js | 12 | ||||
-rwxr-xr-x | plugins/Annotations/stylesheets/annotations.less | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/plugins/Annotations/javascripts/annotations.js b/plugins/Annotations/javascripts/annotations.js index 9512ac28d6..4aac660f59 100755 --- a/plugins/Annotations/javascripts/annotations.js +++ b/plugins/Annotations/javascripts/annotations.js @@ -520,11 +520,7 @@ loadingAnnotationManager = true; - var isDashboard = !!$('#dashboardWidgetsArea').length; - - if (isDashboard) { - $('.loadingPiwikBelow', domElem).insertAfter($('.evolution-annotations', domElem)); - } + $('.loadingPiwikBelow', domElem).insertAfter($('.evolution-annotations', domElem)); var loading = $('.loadingPiwikBelow', domElem).css({display: 'block'}); @@ -546,11 +542,7 @@ loading.css('visibility', 'hidden'); // add & show annotation manager - if (isDashboard) { - manager.insertAfter($('.evolution-annotations', domElem)); - } else { - $('.dataTableFeatures', domElem).append(manager); - } + manager.insertAfter($('.evolution-annotations', domElem)); manager.slideDown('slow', function () { loading.hide().css('visibility', 'visible'); diff --git a/plugins/Annotations/stylesheets/annotations.less b/plugins/Annotations/stylesheets/annotations.less index 2810ce0bf5..e0bfd541b6 100755 --- a/plugins/Annotations/stylesheets/annotations.less +++ b/plugins/Annotations/stylesheets/annotations.less @@ -12,7 +12,7 @@ top:10px; } -#dashboard, .ui-dialog { +#content, .ui-dialog { .evolution-annotations { margin-top: -5px; margin-bottom: -5px; @@ -26,6 +26,14 @@ } } +.ui-dialog .evolution-annotations > span { + top: 25px; +} + +body > .widget .evolution-annotations > span { + top: -25px; +} + .annotation-manager { text-align: left; margin-top: -18px; |