Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Aubry <matt@piwik.org>2016-03-15 03:15:33 +0300
committerMatthieu Aubry <matt@piwik.org>2016-03-15 03:15:33 +0300
commit121dd99d6b7eb31ed56f9dd0e025c7e1b3099a59 (patch)
treee2923910cf86464976e8375441045c2f2565ed4d
parent77ceacbcf3ec05491523c59151da27c7b88bb9bc (diff)
parent34278b00c7fcb5b1fb19cdca783ce39efb6ac02d (diff)
Merge pull request #9917 from piwik/zindex
Fixes various z-index issues
-rw-r--r--plugins/CoreHome/angularjs/siteselector/siteselector.directive.less2
-rw-r--r--plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less2
-rw-r--r--tests/UI/specs/UIIntegration_spec.js8
3 files changed, 9 insertions, 3 deletions
diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less
index b6e4c3d676..78dd32a862 100644
--- a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less
+++ b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less
@@ -22,7 +22,7 @@
> .siteSelector {
position: absolute;
- z-index: 9999;
+ z-index: 999;
}
a.title {
diff --git a/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less b/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less
index 117fcf8716..6d071025f9 100644
--- a/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less
+++ b/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less
@@ -10,7 +10,7 @@ table.dataTable th .columnDocumentation {
border: 1px solid #e4e5e4;
padding: 5px 10px 6px 10px;
border-radius: 4px;
- z-index: 125;
+ z-index: 150;
position: absolute;
box-shadow: 0 0 4px #e4e5e4;
cursor: default;
diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js
index 9703f28814..fd91c3711d 100644
--- a/tests/UI/specs/UIIntegration_spec.js
+++ b/tests/UI/specs/UIIntegration_spec.js
@@ -244,6 +244,12 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
}, done);
});
+ it('should display metric tooltip correctly', function (done) {
+ expect.screenshot("metric_tooltip").to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
+ page.mouseMove('[data-report="Referrers.getReferrerType"] #nb_visits .thDIV', 500);
+ }, done);
+ });
+
it('should load the referrers > search engines & keywords page correctly', function (done) {
expect.screenshot('referrers_search_engines_keywords').to.be.captureSelector('.pageWrap,.expandDataTableFooterDrawer', function (page) {
page.load("?" + urlBase + "#" + generalParams + "&module=Referrers&action=getSearchEnginesAndKeywords");
@@ -687,4 +693,4 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
page.click('a.actionSegmentVisitorLog:visible');
}, done);
});
-}); \ No newline at end of file
+});