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:
authorStefan Giehl <stefan@matomo.org>2020-10-15 10:31:40 +0300
committerGitHub <noreply@github.com>2020-10-15 10:31:40 +0300
commit81e5f36429db254dfeb5bc3ccc545b0dde1b18da (patch)
tree5ca4b466211a30861e5bfaf117de764ea8f8c8e5 /plugins/MultiSites
parentd58aee2106fa78456c26e8dde6e182917ec7e948 (diff)
Fix icon align of outlinks in datatables (#16492)
* Fix icon align of outlinks in datatables * improve styling * Move datatable icons to matomo font * replace icon in multisites report * improve css * improve css so it looks good on all os/browser * small adjustments * Adjust multisites data table * updates expected screenshots * move plus/minus icon one pixel down * move outlink icon one pixel down * updates expected screenshots * improve icon css * increase size of plus/minus icon * updates expected screenshots * updates submodules * fix ui test
Diffstat (limited to 'plugins/MultiSites')
-rw-r--r--plugins/MultiSites/angularjs/dashboard/dashboard.directive.less2
-rw-r--r--plugins/MultiSites/angularjs/site/site.directive.html16
-rw-r--r--plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png4
-rw-r--r--plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png4
-rw-r--r--plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png4
-rw-r--r--plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png4
-rw-r--r--plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png4
7 files changed, 20 insertions, 18 deletions
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less
index 4594c84bba..6c7a1b4cca 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less
@@ -175,6 +175,8 @@
a {
width: auto;
+ float: left;
+ padding-right: 0.5em;
}
}
td.multisites-label a:hover {
diff --git a/plugins/MultiSites/angularjs/site/site.directive.html b/plugins/MultiSites/angularjs/site/site.directive.html
index 727990b55d..27342fefcb 100644
--- a/plugins/MultiSites/angularjs/site/site.directive.html
+++ b/plugins/MultiSites/angularjs/site/site.directive.html
@@ -1,27 +1,27 @@
<tr ng-class="{'groupedWebsite': website.group, 'website': !website.group, 'group': website.isGroup}">
<td ng-if="!website.isGroup" class="multisites-label label">
- <a title="View reports" ng-href="index.php?module=CoreHome&action=index&date={{ date }}&period={{ period }}&idSite={{ website.idsite }}" class="truncated-text-line">{{ website.label }}</a>
+ <a title="View reports" ng-href="index.php?module=CoreHome&action=index&date={{ date }}&period={{ period }}&idSite={{ website.idsite }}" class="value truncated-text-line">{{ website.label }}</a>
- <span style="width: 10px; margin-left:3px;">
+ <span>
<a rel="noreferrer noopener" target="_blank" title="{{ 'General_GoTo'|translate:website.main_url }}" ng-href="{{ website.main_url }}">
- <img src="plugins/Morpheus/images/link.png"/></a>
+ <span class="icon icon-outlink"></span></a>
</span>
</td>
<td ng-if="website.isGroup" class="multisites-label label">
- {{ website.label }}
+ <span class="value">{{ website.label }}</span>
</td>
<td class="multisites-column">
- {{ website.nb_visits }}
+ <span class="value">{{ website.nb_visits }}</span>
</td>
<td class="multisites-column">
- {{ website.nb_pageviews }}
+ <span class="value">{{ website.nb_pageviews }}</span>
</td>
<td ng-if="displayRevenueColumn" class="multisites-column">
- {{ website.revenue }}
+ <span class="value">{{ website.revenue }}</span>
</td>
<td ng-if="period != 'range'" class="multisites-evolution">
- <div class="visits" ng-if="!website.isGroup">
+ <div class="visits value" ng-if="!website.isGroup">
<span ng-show="website[evolutionMetric] > 0"><img src="plugins/MultiSites/images/arrow_up.png" alt="" /> <span style="color: green;">{{ website[evolutionMetric] }}%</span></span>
<span ng-show="website[evolutionMetric] == 0"><img src="plugins/MultiSites/images/stop.png" alt="" /> <span>{{ website[evolutionMetric] }}%</span></span>
<span ng-show="website[evolutionMetric] < 0"><img src="plugins/MultiSites/images/arrow_down.png" alt="" /> <span style="color: red;">{{ website[evolutionMetric] }}%</span></span>
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
index b8af23085d..b75b6f2b4b 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bc1c2b036f508c6710496bbf437a90b54549c342d609a9e4c8448b2d9f377539
-size 276473
+oid sha256:827c39b6477d331340650288de48c389fa345115cf5cb52a1b1ae97cc2d83f43
+size 281242
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
index 1819dd20d2..089787d20b 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:50c69c1e07480e036c844b866cc8b974062a24c0b64c69858dc44a2d53e94492
-size 55276
+oid sha256:f866b750ce195cbf1f250213de7d128e562d7bab2ec10a58c9365ce79595ee9b
+size 56046
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
index 74c676d6b5..8522855680 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6e411a462fffe4ba9b423733e148ba30cfbc5f65cf147888b508fd5dfbfb4326
-size 72053
+oid sha256:a477ea5a3e53e3a1e82181385159e312b79d97792f084868c62c9ef14225d41d
+size 72809
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png
index 52ff1929ca..a204ad66f1 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4958b995b4ab33779f8c8ddfa97e7167ed309d3dd13185d2744390c1f7f26ed9
-size 240421
+oid sha256:b46bed462c5fca2eda732e8e680eafd6edf147c38df617f2ce0b5222b7371216
+size 244905
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
index d5076e7d45..1e521d9989 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:86e4a3872be7528694c38eff6c8833d7a2b4e77ff121fa7e48a8b90518ed0fac
-size 55244
+oid sha256:c0f8a6ba0033f2a3844dec327de82b547481f4b97b5bdd50b7d3955c9157b1fb
+size 56046