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@piwik.org>2018-09-04 03:44:45 +0300
committerdiosmosis <diosmosis@users.noreply.github.com>2018-09-04 03:44:45 +0300
commit6af22727ed3e6b074147a4f5a3137da66d6c5308 (patch)
tree1656b2b2e82258270a71af3aed1db00d6edaa19e
parent3b86d4f9b6b01c5d39aa9d8326bc5884218e6980 (diff)
Use font icon for visitorlog instead of images (#13312)
* Use font icon for visitorlog instead of images * Update expected screenshots.
-rw-r--r--plugins/Ecommerce/templates/conversionOverview.twig2
-rw-r--r--plugins/Goals/templates/conversionOverview.twig2
-rw-r--r--plugins/Live/images/visitorlog-hover.pngbin1275 -> 0 bytes
-rw-r--r--plugins/Live/images/visitorlog.pngbin1273 -> 0 bytes
-rw-r--r--plugins/Live/stylesheets/live.less5
-rw-r--r--plugins/UserId/images/visitordetails-hover.pngbin1275 -> 0 bytes
-rw-r--r--plugins/UserId/images/visitordetails.pngbin1273 -> 0 bytes
-rw-r--r--plugins/UserId/javascripts/rowaction.js3
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png4
13 files changed, 13 insertions, 19 deletions
diff --git a/plugins/Ecommerce/templates/conversionOverview.twig b/plugins/Ecommerce/templates/conversionOverview.twig
index 9578987353..98df3f6efe 100644
--- a/plugins/Ecommerce/templates/conversionOverview.twig
+++ b/plugins/Ecommerce/templates/conversionOverview.twig
@@ -16,7 +16,7 @@
{% endif %}
</ul>
<a href="javascript:;" class="segmentedlog" onclick="SegmentedVisitorLog.show('Goals.getMetrics', 'visitConvertedGoalId=={{ idGoal }}', {})">
- {{ 'Live_RowActionTooltipWithDimension'|translate('General_Goal'|translate) }}
+ <span class="icon-visitor-profile rowActionIcon"></span> {{ 'Live_RowActionTooltipWithDimension'|translate('General_Goal'|translate) }}
</a>
<br style="clear:left"/>
</div> \ No newline at end of file
diff --git a/plugins/Goals/templates/conversionOverview.twig b/plugins/Goals/templates/conversionOverview.twig
index b3dd870db3..1daa4dbb31 100644
--- a/plugins/Goals/templates/conversionOverview.twig
+++ b/plugins/Goals/templates/conversionOverview.twig
@@ -16,7 +16,7 @@
</li>
</ul>
<a href="javascript:;" class="segmentedlog" onclick="SegmentedVisitorLog.show('Goals.getMetrics', 'visitConvertedGoalId=={{ idGoal }}', {})">
- {{ 'Live_RowActionTooltipWithDimension'|translate('General_Goal'|translate) }}
+ <span class="icon-visitor-profile rowActionIcon"></span> {{ 'Live_RowActionTooltipWithDimension'|translate('General_Goal'|translate) }}
</a>
{{ postEvent("Template.afterGoalConversionOverviewReport") }}
<br style="clear:left"/>
diff --git a/plugins/Live/images/visitorlog-hover.png b/plugins/Live/images/visitorlog-hover.png
deleted file mode 100644
index 523a8ac6b4..0000000000
--- a/plugins/Live/images/visitorlog-hover.png
+++ /dev/null
Binary files differ
diff --git a/plugins/Live/images/visitorlog.png b/plugins/Live/images/visitorlog.png
deleted file mode 100644
index 423392db75..0000000000
--- a/plugins/Live/images/visitorlog.png
+++ /dev/null
Binary files differ
diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less
index 2f310350ff..5f0e60a6c0 100644
--- a/plugins/Live/stylesheets/live.less
+++ b/plugins/Live/stylesheets/live.less
@@ -405,11 +405,6 @@ a.visitor-log-visitor-profile-link {
.segmentedlog {
margin: 8px;
display: block;
- background: transparent url('plugins/Live/images/visitorlog.png') no-repeat 0 0;
- padding-left: 25px;
-}
-.segmentedlog:hover {
- background-image: url('plugins/Live/images/visitorlog-hover.png');
}
#widgetLivewidget {
diff --git a/plugins/UserId/images/visitordetails-hover.png b/plugins/UserId/images/visitordetails-hover.png
deleted file mode 100644
index 523a8ac6b4..0000000000
--- a/plugins/UserId/images/visitordetails-hover.png
+++ /dev/null
Binary files differ
diff --git a/plugins/UserId/images/visitordetails.png b/plugins/UserId/images/visitordetails.png
deleted file mode 100644
index 423392db75..0000000000
--- a/plugins/UserId/images/visitordetails.png
+++ /dev/null
Binary files differ
diff --git a/plugins/UserId/javascripts/rowaction.js b/plugins/UserId/javascripts/rowaction.js
index d100c1f3f5..eb78fac78d 100644
--- a/plugins/UserId/javascripts/rowaction.js
+++ b/plugins/UserId/javascripts/rowaction.js
@@ -38,8 +38,7 @@
instance: null,
- dataTableIcon: 'plugins/UserId/images/visitordetails.png',
- dataTableIconHover: 'plugins/UserId/images/visitordetails-hover.png',
+ dataTableIcon: 'icon-visitor-profile',
order: 30,
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png
index c190af516c..c2b953e434 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bf2b8f2274fc30e8f54fd08bbbf6729982d50663a52e001adcb4bed153bd7a56
-size 1510344
+oid sha256:c8993efe54d654f21b2a83b4424c5daab1e140bb32961efd884ffa5445084881
+size 1511529
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png
index c23d8aa606..f9d44e7a68 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_overview.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d9f43b81c6a19fb0a57b675155cc0a66ed110ad861701daa2b9f6e79bf3b5bc2
-size 75668
+oid sha256:77b01d92d24edbde53e3e1218581b09cf5c54f15d7c43c2799ae002c570d2804
+size 75242
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png
index c23d8aa606..f9d44e7a68 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_ecommerce.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d9f43b81c6a19fb0a57b675155cc0a66ed110ad861701daa2b9f6e79bf3b5bc2
-size 75668
+oid sha256:77b01d92d24edbde53e3e1218581b09cf5c54f15d7c43c2799ae002c570d2804
+size 75242
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png
index 604ff4888e..cf7e9cefab 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e55d181970c6758027c9ed8918e471252aa39f83469e67fb91897831e4f40a3e
-size 207669
+oid sha256:fe9cbf8303d2f6e11fe216e91df568540618ba25955755f67e92afdfa679865f
+size 207236
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png
index bb670c4311..a28a169be2 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8a08264b37fa4ed904859f83622a406a88d9fe9c08ced29d906979fbdeccba55
-size 209588
+oid sha256:019715fa65e2ac65c7e98997de8975603ddaa001d47f06e4578cf459ff2c8b7e
+size 209266