Skip to content
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

DEV-17398 Add and use correct marketplace icon #21525

Merged
merged 5 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions LEGALNOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 12 additions & 12 deletions plugins/Marketplace/vue/dist/Marketplace.umd.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugins/Marketplace/vue/dist/Marketplace.umd.min.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion plugins/Morpheus/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ public function demo()
'admin-platform',
'admin-development',
'admin-settings',

'marketplace',

],
];
Expand Down
Binary file modified plugins/Morpheus/fonts/matomo.eot
Binary file not shown.
1 change: 1 addition & 0 deletions plugins/Morpheus/fonts/matomo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/Morpheus/fonts/matomo.ttf
Binary file not shown.
Binary file modified plugins/Morpheus/fonts/matomo.woff
Binary file not shown.
Binary file modified plugins/Morpheus/fonts/matomo.woff2
Binary file not shown.
2 changes: 1 addition & 1 deletion plugins/Morpheus/fonts/selection.json

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions plugins/Morpheus/fonts/svgs/icon-marketplace.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 8 additions & 5 deletions plugins/Morpheus/stylesheets/base/icons.css
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -432,4 +432,7 @@
}
.icon-drop-crossed:before {
content: "\e90b";
}
}
.icon-marketplace:before {
content: "\e90c";
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions tests/UI/expected-screenshots/Menus_mainmenu_loaded.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions tests/UI/expected-screenshots/Menus_mobile_left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading