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)
@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?
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
Me :slightly_smiling_face:
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 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
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>
ok. Everything should be fixed/updated now. Thanks for the PR @Findus23