DEV-17398 Add and use correct marketplace icon (#21525)

* Add marketplace icon and update matomo icon font * Use newly added marketplace icon for the nav bar button * Update UI test screenshots after replacing an icon * updates expected UI test files --------- Co-authored-by: Stefan Giehl <[email protected]>
matomo-org · Nov 13, 2023 · 780f4cd · 780f4cd
1 parent 7055925
commit 780f4cd
Show file tree

Hide file tree

Showing 31 changed files with 72 additions and 57 deletions.
diff --git a/LEGALNOTICE b/LEGALNOTICE
@@ -298,6 +298,10 @@ THIRD-PARTY CONTENT
     Link: https://pictogrammers.com/
     License: Apache License Version 2.0
 
+    Name: Feather icons ("icon-marketplace") in plugins/Morpheus/fonts
+    Link: https://feathericons.com/
+    License: MIT (Expat)
+
 Notes:
 - the "New BSD" license refers to either the "Modified BSD" and "Simplified BSD"
   licenses (2- or 3-clause), which are GPL compatible.

diff --git a/...ions/tests/UI/expected-screenshots/CustomDimensions_report_actions_mainmenu.png b/...ions/tests/UI/expected-screenshots/CustomDimensions_report_actions_mainmenu.png
diff --git a/...nsions/tests/UI/expected-screenshots/CustomDimensions_report_visit_mainmenu.png b/...nsions/tests/UI/expected-screenshots/CustomDimensions_report_visit_mainmenu.png
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
diff --git a/...ls/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls.png b/...ls/tests/UI/expected-screenshots/Goals_action_goals_visualization_page_urls.png
diff --git a/...UI/expected-screenshots/Goals_action_goals_visualization_page_urls_subtable.png b/...UI/expected-screenshots/Goals_action_goals_visualization_page_urls_subtable.png
diff --git a/plugins/Marketplace/vue/dist/Marketplace.umd.js b/plugins/Marketplace/vue/dist/Marketplace.umd.js
diff --git a/plugins/Marketplace/vue/dist/Marketplace.umd.min.js b/plugins/Marketplace/vue/dist/Marketplace.umd.min.js
diff --git a/plugins/Marketplace/vue/src/RichMenuButton/RichMenuButton.vue b/plugins/Marketplace/vue/src/RichMenuButton/RichMenuButton.vue
@@ -13,7 +13,7 @@
          @click.prevent="$emit('action')"
          @keyup.enter="$emit('action')"
       >
-        <span class="icon-heart">&nbsp;</span>
+        <span class="icon-marketplace">&nbsp;</span>
         {{ translate('Marketplace_Marketplace') }}
       </a>
     </p>

diff --git a/plugins/Morpheus/Controller.php b/plugins/Morpheus/Controller.php
@@ -817,7 +817,7 @@ public function demo()
                 'admin-platform',
                 'admin-development',
                 'admin-settings',
-
+                'marketplace',
 
             ],
         ];

diff --git a/plugins/Morpheus/fonts/matomo.eot b/plugins/Morpheus/fonts/matomo.eot
diff --git a/plugins/Morpheus/fonts/matomo.svg b/plugins/Morpheus/fonts/matomo.svg
diff --git a/plugins/Morpheus/fonts/matomo.ttf b/plugins/Morpheus/fonts/matomo.ttf
diff --git a/plugins/Morpheus/fonts/matomo.woff b/plugins/Morpheus/fonts/matomo.woff
diff --git a/plugins/Morpheus/fonts/matomo.woff2 b/plugins/Morpheus/fonts/matomo.woff2
diff --git a/plugins/Morpheus/fonts/selection.json b/plugins/Morpheus/fonts/selection.json
diff --git a/plugins/Morpheus/fonts/svgs/icon-marketplace.svg b/plugins/Morpheus/fonts/svgs/icon-marketplace.svg
diff --git a/plugins/Morpheus/stylesheets/base/icons.css b/plugins/Morpheus/stylesheets/base/icons.css
@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'matomo';
   src:
-          url('plugins/Morpheus/fonts/matomo.woff2?alz7inm') format('woff2'),
-          url('plugins/Morpheus/fonts/matomo.woff?alz7inm') format('woff'),
-          url('plugins/Morpheus/fonts/matomo.ttf?alz7inm') format('truetype'),
-          url('plugins/Morpheus/fonts/matomo.svg?alz7inm#matomo') format('svg');
+          url('plugins/Morpheus/fonts/matomo.woff2?19jj68') format('woff2'),
+          url('plugins/Morpheus/fonts/matomo.woff?19jj68') format('woff'),
+          url('plugins/Morpheus/fonts/matomo.ttf?19jj68') format('truetype'),
+          url('plugins/Morpheus/fonts/matomo.svg?19jj68#matomo') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -432,4 +432,7 @@
 }
 .icon-drop-crossed:before {
   content: "\e90b";
-}
+}
+.icon-marketplace:before {
+  content: "\e90c";
+}
diff --git a/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png b/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png
diff --git a/...tor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png b/...tor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png
diff --git a/tests/UI/expected-screenshots/Menus_mainmenu_loaded.png b/tests/UI/expected-screenshots/Menus_mainmenu_loaded.png
diff --git a/tests/UI/expected-screenshots/Menus_mainmenu_loaded_withpromos.png b/tests/UI/expected-screenshots/Menus_mainmenu_loaded_withpromos.png
diff --git a/tests/UI/expected-screenshots/Menus_mainmenu_lower_clicked.png b/tests/UI/expected-screenshots/Menus_mainmenu_lower_clicked.png
diff --git a/tests/UI/expected-screenshots/Menus_mainmenu_upper_clicked.png b/tests/UI/expected-screenshots/Menus_mainmenu_upper_clicked.png
diff --git a/tests/UI/expected-screenshots/Menus_mobile_left.png b/tests/UI/expected-screenshots/Menus_mobile_left.png