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:
authorLukas Winkler <Findus23@users.noreply.github.com>2017-03-29 23:19:15 +0300
committerMatthieu Aubry <mattab@users.noreply.github.com>2017-03-29 23:19:15 +0300
commita21b868d63b1a210016c9a43a3a470b5e88f6c64 (patch)
tree5190179fd24d4bb8bf9f40338eae3a3b66a1ca5e /plugins/Contents
parent9c86cd6f9cbcb8c0bbb2825f725658f2b6b1fc3f (diff)
New flag icons (#11553)
* updated flag icons * remove lines completly * Visitors in Real-time * added ti flag * fix merge * readd logoHeight * remove flags from plugins/UserCountry/images/ * change flag directory * (hopefully) fix all tests * UserCountry system tests * Fix tests refs https://github.com/piwik/piwik/pull/11553 * Fixed CustomDimensions tests * remove unused flags * remove flag of united nations * System tests with new path * light border around flags in goals and live view * Fix BC system test * border around flag in visitor profile * Border around country flags in reports * border around flag icons in HTML reports * simpler css * System tests * UI tests show new flags + borders around them
Diffstat (limited to 'plugins/Contents')
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml4
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml4
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml4
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml4
-rw-r--r--plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml4
5 files changed, 10 insertions, 10 deletions
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
index 436975fff5..b16427cf44 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
@@ -76,7 +76,7 @@
<continentCode>eur</continentCode>
<country>France</country>
<countryCode>fr</countryCode>
- <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
<region />
<regionCode />
<city />
@@ -188,7 +188,7 @@
<continentCode>eur</continentCode>
<country>France</country>
<countryCode>fr</countryCode>
- <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
<region />
<regionCode />
<city />
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
index 436975fff5..b16427cf44 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
@@ -76,7 +76,7 @@
<continentCode>eur</continentCode>
<country>France</country>
<countryCode>fr</countryCode>
- <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
<region />
<regionCode />
<city />
@@ -188,7 +188,7 @@
<continentCode>eur</continentCode>
<country>France</country>
<countryCode>fr</countryCode>
- <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
<region />
<regionCode />
<city />
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
index 436975fff5..b16427cf44 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
@@ -76,7 +76,7 @@
<continentCode>eur</continentCode>
<country>France</country>
<countryCode>fr</countryCode>
- <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
<region />
<regionCode />
<city />
@@ -188,7 +188,7 @@
<continentCode>eur</continentCode>
<country>France</country>
<countryCode>fr</countryCode>
- <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
<region />
<regionCode />
<city />
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
index 436975fff5..b16427cf44 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
@@ -76,7 +76,7 @@
<continentCode>eur</continentCode>
<country>France</country>
<countryCode>fr</countryCode>
- <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
<region />
<regionCode />
<city />
@@ -188,7 +188,7 @@
<continentCode>eur</continentCode>
<country>France</country>
<countryCode>fr</countryCode>
- <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
<region />
<regionCode />
<city />
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
index 436975fff5..b16427cf44 100644
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
@@ -76,7 +76,7 @@
<continentCode>eur</continentCode>
<country>France</country>
<countryCode>fr</countryCode>
- <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
<region />
<regionCode />
<city />
@@ -188,7 +188,7 @@
<continentCode>eur</continentCode>
<country>France</country>
<countryCode>fr</countryCode>
- <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+ <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
<region />
<regionCode />
<city />