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.
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
New device icons #11601
New device icons #11601
Conversation
I like the look of the new icons! |
@sgiehl Is it possible something went wrong with the commits just now? Travis restarted and I got a conflict when pulling ( Did I do something wrong? |
if you don't have any additional local changes or commits try: |
Thanks, that fixed it. But what caused it? |
Me 🙂 |
Ah, that explains it 😄 |
@Findus23 Let's merge this for the upcoming 3.0.4. Is there any work left on your side? |
It's ready for me. There are just some tests that need to be fixed. |
Ok. I'll rebase the branch and try to fix the remaining tests so we can merge it afterwards |
former plugins/DevicesDetection/images/screens
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> |
87a6627
to
1e9ce61
Compare
ok. Everything should be fixed/updated now. Thanks for the PR @Findus23 |
Well done, new icons look great! |
fixes #11155
This replaces the old device icons with better ones from https://material.io/icons/
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)