8000 New device icons by Findus23 · Pull Request #11601 · matomo-org/matomo · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

New device icons #11601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 6 commits into from
Apr 18, 2017
Merged

New device icons #11601

merged 6 commits into from
Apr 18, 2017

Conversation

Findus23
Copy link
Collaborator
@Findus23 Findus23 commented Apr 8, 2017 •
edited
Loading

fixes #11155

This replaces the old device icons with better ones from https://material.io/icons/

screenshot_20170408_094507

The icons aren't final so if anyone has better ideas, just mention them.

I hope the changes in plugins/DevicesDetection/functions.php are okay.

There are still some tests failing.

(the failing UI tests are because of the new browser icons)

@Findus23 Findus23 added the c: Design / UI For issues that impact Matomo's user interface or the design overall. label Apr 8, 2017
@Findus23 Findus23 self-assigned this Apr 8, 2017
@sgiehl sgiehl force-pushed the new-device-icons branch from b495e27 to 87a6627 Compare April 9, 2017 16:34
@sgiehl
Copy link
Member
sgiehl commented Apr 9, 2017

I like the look of the new icons!

@Findus23
Copy link
Collaborator Author
Findus23 commented Apr 9, 2017 •
edited
Loading

@sgiehl Is it possible something went wrong with the commits just now? Travis restarted and I got a conflict when pulling (warning: Failed to merge submodule plugins/CustomDimensions (commits don't follow merge-base))

Did I do something wrong?

@sgiehl
Copy link
Member
sgiehl commented Apr 9, 2017

if you don't have any additional local changes or commits try:
git reset --hard origin/new-device-icons
otherwise you could also force push your branch

@Findus23
Copy link
Collaborator Author
Findus23 commented Apr 9, 2017

Thanks, that fixed it. But what caused it?

@sgiehl
Copy link
Member
sgiehl commented Apr 9, 2017

Me 🙂
I had rebased your branch locally to view it with latest 3.x-dev changes and accidentally pushed it - thought I already was on another branch...

@Findus23
Copy link
Collaborator Author
Findus23 commented Apr 9, 2017

Ah, that explains it 😄

@sgiehl sgiehl added this to the 3.0.4 milestone Apr 18, 2017
@sgiehl
Copy link
Member
sgiehl commented Apr 18, 2017

@Findus23 Let's merge this for the upcoming 3.0.4. Is there any work left on your side?

@Findus23
Copy link
Collaborator Author

It's ready for me. There are just some tests that need to be fixed.

@sgiehl
Copy link
Member
sgiehl commented Apr 18, 2017

Ok. I'll rebase the branch and try to fix the remaining tests so we can merge it afterwards

@Findus23
Copy link
Collaborator Author

In addition we'll need to make this changes to the CustomDimensions Plugin

diff --git a/tests/System/expected/test___Live.getLastVisitsDetails_year.xml b/tests/System/expected/test___Live.getLastVisitsDetails_year.xml
index 9b55fd8..899c81f 100644
--- a/tests/System/expected/test___Live.getLastVisitsDetails_year.xml
+++ b/tests/System/expected/test___Live.getLastVisitsDetails_year.xml
@@ -65,7 +65,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
+		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>
@@ -183,7 +183,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
+		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>
@@ -299,7 +299,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
+		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>
@@ -447,7 +447,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
+		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>
@@ -563,7 +563,7 @@
 		<languageCode>fr</languageCode>
 		<language>French</language>
 		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon>
+		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
 		<deviceBrand>Unknown</deviceBrand>
 		<deviceModel />
 		<operatingSystem>Windows XP</operatingSystem>

@sgiehl sgiehl force-pushed the new-device-icons branch from 87a6627 to 1e9ce61 Compare April 18, 2017 15:46
@sgiehl
Copy link
Member
sgiehl commented Apr 18, 2017

ok. Everything should be fixed/updated now. Thanks for the PR @Findus23

@sgiehl sgiehl merged commit ac9d6ab into 3.x-dev Apr 18, 2017
@sgiehl sgiehl deleted the new-device-icons branch April 18, 2017 17:50
@Findus23 Findus23 mentioned this pull request Apr 19, 2017
Merged
@mattab
Copy link
Member
mattab commented May 16, 2017

Well done, new icons look great!

@Findus23 Findus23 restored the new-device-icons branch October 4, 2019 09:48
@sgiehl sgiehl deleted the new-device-icons branch November 13, 2019 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Findus23 Findus23

Labels
c: Design / UI For issues that impact Matomo's user interface or the design overall.
Milestone
3.0.4
Development

Successfully merging this pull request may close these issues.

Improve icons and images in piwik
3 participants
@Findus23 @sgiehl @mattab
0