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:
authordiosmosis <diosmosis@users.noreply.github.com>2020-06-08 02:46:56 +0300
committerGitHub <noreply@github.com>2020-06-08 02:46:56 +0300
commitd0aaab95f1ef6d8b748b0e8d54f811a366864249 (patch)
tree86820438b4b56c764912316ebe8152362aa3e2dd /plugins/Marketplace
parentd10c4e89dc5d1081a3755497c45d366b470eeec7 (diff)
Switch from bower to npm and update JS libraries (#14082)
* Starting to replace bower with npm: use updated jquery-ui from npm. * Use jquery from npm./ * Use angular from npm. * Add more angular libraries. * Use chroma-js from npm. * Remove html5shiv, does not appear to be used. * Use iframe resizer library from npm. * Add jquery-mousewheel * Add jquery.dotdotdot from npm. * Get jquery.scrollto from npm. * Get jscrollpane from npm. * Get materialize-css from npm. * Get mousetrap from npm. * Remove ngDialog, as it is no longer used. * Install qrcode.js from npm. * Get sprintf-js from npm. * Get visibillityjs from npm. * Remove bower.json. * Getting parts of matomo to work w/ new versions of libraries installed by npm. * Ignore node_modules subfolders in node_modules since we only use npm for frontend dependencies + fix a test. * Fix button padding. * Fix series picker checkboxes. * Fix karma conf. * Fix CSS in right place. * Fixing more css/less issues. * More test fixes. * Limit selection style fix. * Fix more tests + materializecss issues. * Fix a couple more tests. * Fix annotation styling. * remove error * add ng-dialog files * try to fix some tests * Fix several UI tests. * fixing more build issues * Fix several more tests and issues. * fixing more tests * split ui tests into 3 groups * fix several more issues and tests * Fix some console warnings on chrome. * Updating more test files. * fix some tests * yet more fixes * couple more fixes * another form fix * Fix some tests. * update screenshot * update more expected files * Fix two more form issues. * test commit (travis is not fetching submodules for some reason...) * remove scripts removed in merge * three travis builds * split UIIntegrationTest into multiple suites * lets try this again * updae several expected screenshots * fix some more tests * fix plugin details material select and tabs initiaialization * update screenshots + css fix * re-initialize materialize tabs since we load jquery-ui afterwards for datepicker which unsets materialize tabs * update more screenshots and fix couple more issues * update more screenshots + tweak to test * more fixes and screenshot updates * fix some issues and update more screenshots * update submodules * more fixes + more updated screenshots * more css fixes and test fixes * couple fixes & updated screenshots * update screenshots * fix random failure * Map old bower_component files to new ones in AssetManager. * Remove node_modules from PR and ignore node_modules in .gitignore and remove libs/jquery (adding new required libs). * Update .travis.yml. * update screenshots * fixing some more issues * fix copy pasta * update screenshots * fix more modal issues * Update css & screenshots. * correct close modal calls * fixing more issues * data-target instead of data-activates * fix more tests * trigger build that works? * fix more tests * update submodule * debugging travis * more debugging * try to fix test * fix modal no button click in test * update more screenshots * couple more test fixes * some more fixes and updated screenshots * update screenshots * apply some review feedback * Fix modal centering and initial top position. * apply some more pr feedback * another pr fix * update submodule * remove style * fix color of checkbox mark * Fix centering the popover Note: centering the popover relative to body doesn't work poperly anymore, maybe because of the fixed position of the widget overlay. Using the ui-widget-overlay to position the dialog centered seems to work * ignore line endings check for node modules * updates expected UI files * submodule updates * use minified file of jquery.browser.js * updates expected test files * ensure to hide parent tooltips when row action tooltips are shown * tweak less for datatable navigation * style is only useful for dashboard * update some screenshots * update submodules Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'plugins/Marketplace')
-rw-r--r--plugins/Marketplace/Marketplace.php2
-rw-r--r--plugins/Marketplace/stylesheets/marketplace.less5
-rw-r--r--plugins/Marketplace/templates/plugin-details.twig4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_superuser_installed.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_user_installed.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_user.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_user.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_user.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_noLicense.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png4
-rw-r--r--plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png4
40 files changed, 82 insertions, 77 deletions
diff --git a/plugins/Marketplace/Marketplace.php b/plugins/Marketplace/Marketplace.php
index f8363eb8e7..a07ef9b1d0 100644
--- a/plugins/Marketplace/Marketplace.php
+++ b/plugins/Marketplace/Marketplace.php
@@ -57,7 +57,7 @@ class Marketplace extends \Piwik\Plugin
public function getJsFiles(&$jsFiles)
{
- $jsFiles[] = "libs/bower_components/iframe-resizer/js/iframeResizer.min.js";
+ $jsFiles[] = "node_modules/iframe-resizer/js/iframeResizer.min.js";
$jsFiles[] = "plugins/Marketplace/angularjs/plugins/plugin-name.directive.js";
$jsFiles[] = "plugins/Marketplace/angularjs/licensekey/licensekey.controller.js";
diff --git a/plugins/Marketplace/stylesheets/marketplace.less b/plugins/Marketplace/stylesheets/marketplace.less
index eedf9e7ec9..6b74a9c1af 100644
--- a/plugins/Marketplace/stylesheets/marketplace.less
+++ b/plugins/Marketplace/stylesheets/marketplace.less
@@ -26,8 +26,11 @@
}
.licenseToolbar {
- > a, > div:not(.licenseKeyText) {
+ > a, > div {
margin-right: 16px;
+ }
+
+ > a, > div:not(.licenseKeyText) {
white-space: nowrap;
}
}
diff --git a/plugins/Marketplace/templates/plugin-details.twig b/plugins/Marketplace/templates/plugin-details.twig
index a24cbb3e86..43d7774c64 100644
--- a/plugins/Marketplace/templates/plugin-details.twig
+++ b/plugins/Marketplace/templates/plugin-details.twig
@@ -283,8 +283,10 @@
}
{% endif %}
+ $('#pluginDetailsTabs select').material_select();
+
$('#pluginDetailsTabs .tabs').tabs();
- $('#pluginDetailsTabs .tabs').tabs('select_tab', active >= 0 ? active : 0);
+ $('#pluginDetailsTabs .tabs').tabs('select', '#tabs-' + (active >= 0 ? active : 0));
$('.pluginDetails a').each(function (index, a) {
var link = $(a).attr('href');
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png
index 7579f33a04..c577b0fafa 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7bd5df60370e86007a0249876f6cc63cd75e94dd86be751d2c67f1817b55a9be
-size 62736
+oid sha256:988793ced1e9a478872bd673acd607be8901d6951c322b31226e6424f6d4ae8f
+size 64335
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png
index cfe3d0f245..3e4b1a8bfa 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2b21392f24a80cbf3c9353eeadd834e03f537850f202b5e89d03b75bdb8d2561
-size 46068
+oid sha256:71e854b225230373f15d4aa61017076ca9a3ba95bfd4fe2b26580cde993aa51e
+size 47871
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png
index f84cd72bb8..f6d2579c1c 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:12d7628295074bf71962e82ee57f4bb6dac83b868feb8b3a36cf3abf2a4dff16
-size 44394
+oid sha256:01de68e6fb414ace23c96991d629b17f1d0702bdf930f6bcc8f5de2ccdb4dc98
+size 45796
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png
index de43be2f80..cf97096475 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cc6813734b77af09c9328118a5e1885de2010841bced08f9276b5a67f486f0b4
-size 106037
+oid sha256:0a53b44050672b5bc722a3ba897e1611b271d61fe8c5986ddf447af86af8f4fa
+size 107029
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png
index 5e533857e4..60519d6d20 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ff01d33fd6c96db48de6e8c2d3fc30fa6b4f6f1068f8b0a855fd71a8dcc93743
-size 89083
+oid sha256:87795ec9b8e6856457db7206bf6fa88b4662540a93478e1384a5ed9dd5837ece
+size 90193
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png
index 2b3022fe09..631a11f55a 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:91bf0af7c2b74ce266db6b825234384293e4812e744b83fc20b1b4a424d308ef
-size 75747
+oid sha256:dd90a3a991cf25eff7f6cbb888deaaac9f246086feb7e8e3e2275d73f04eadfd
+size 76180
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png
index 36c6f057cf..902bfd00e6 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c73cb54587eba915e8d398eaf6f15e304470b186f8a52aa29ce8876a8fcdaf1a
-size 106258
+oid sha256:23ee17bc6882bdc8c154632207b1553d274758d955d35540861804b951d938bb
+size 106455
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png
index 92f342dfe6..43dbdecdf6 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:42689934d561c6fd45b3c38ebd6b61038c55adeba11abb41607a6660e666a936
-size 89723
+oid sha256:8dfd6b2decc446b475a1eff2a93d937e546b520861ccbc65d3f0859cec4938fb
+size 90142
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png
index b4ab353431..6961ba62d4 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c2f0491ba3bd45addae5482b365db38b1d86b0f6b38321941e72eb78673e7b82
-size 75371
+oid sha256:20a42aa2b08a30fe739e1b8e430025256c3c175cebd10703cda2738524e4883f
+size 75797
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png
index 87432f9d9b..67ad927c5b 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2e8141d0c04d2f69eff85097098538aed720812c96bfec8a9cd7a6e4637ede24
-size 90389
+oid sha256:c7734014cfad92514f7a47bf58ffc4592d3a2b6e42e22376480de52230a7f017
+size 91176
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_superuser_installed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_superuser_installed.png
index fb99167ee7..7b484f30ad 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_superuser_installed.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_superuser_installed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4b6ca44ac048a18cba1a2d12f7c01620b2e970e3d08c3a256db99aeacc4ac658
-size 72802
+oid sha256:2def3adebb908aea813d83008af801ab257e3a6f743e5de460f60540e7eee75e
+size 73521
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_user_installed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_user_installed.png
index 88ebf4312e..a9bc09f09f 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_user_installed.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_user_installed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ff37ac7d254ad29cb1be0505a8c75c5a9cad3f4b6e5f8558458afc04de730a6f
-size 72046
+oid sha256:12d3167941e272a6d749131262229eb53c6813f626dc7b1bd8ecd55751640e0e
+size 72673
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png
index 960b916dcf..b5d34a9324 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6122d2358736c49d9ef87d59d739527309aa8303dc1d6c73ba6744a98454a514
-size 56517
+oid sha256:f20f760fd2d925ddc88fcc7bb567bb0157747a66f6eb9fda35e424916ce44223
+size 56241
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png
index 960b916dcf..b5d34a9324 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6122d2358736c49d9ef87d59d739527309aa8303dc1d6c73ba6744a98454a514
-size 56517
+oid sha256:f20f760fd2d925ddc88fcc7bb567bb0157747a66f6eb9fda35e424916ce44223
+size 56241
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_user.png
index 2f2f0a9543..cea76e6973 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_user.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_user.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c7ee520dddf027138bcb0f39e5e6831bcef682624db3ac2cc7b8725ec3da77b8
-size 57157
+oid sha256:1a279a479b39c396e08efa6bfb3bb7eeda5912b62d8444272e32482cbd0f434e
+size 57017
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png
index 9e9c884303..7845a39027 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c540ec4628dfcc4524abeb4dd5b47f4c2836811fb3f05881de66e917192da6ae
-size 65679
+oid sha256:88512c74a009c571a521727c2e8fc772f2b3a2dd9de3c15d7e41f42b3acb0cee
+size 65473
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png
index 9e9c884303..7845a39027 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c540ec4628dfcc4524abeb4dd5b47f4c2836811fb3f05881de66e917192da6ae
-size 65679
+oid sha256:88512c74a009c571a521727c2e8fc772f2b3a2dd9de3c15d7e41f42b3acb0cee
+size 65473
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_user.png
index 41fba79ff7..516aa0f712 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_user.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_user.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6ac3376eb4bc4a87a6eb71b12eb021be61bd9c0f83b84b9b4d63a3694a87ed66
-size 46234
+oid sha256:6413777ef0245c97889ca8d2fd93c66d7166e3f10740213993220278859e0e88
+size 46097
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png
index 38c178a3aa..57ef576086 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:385b8b6028e9e9f97960cc47d79b1085ad4cd4bc68ea4e0475fd325246829907
-size 67001
+oid sha256:4611cd4efc8ce354eaec8cc76d1495e1884536b6f952f2ec589a419828eabe6a
+size 66793
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png
index 08c705af33..c9fd364467 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bcabbcec0eaa523c1b7ad88e3a1a0ed74b05abcdd7837d12b88e017af84469a6
-size 67118
+oid sha256:6ec4fac2f476aa8cddbf89404e3303a9f7296db48c13e0fad8f6ad1ff37e63f4
+size 66886
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_user.png
index afcd3de497..5a6a3f8234 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_user.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_user.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a1363e6fe0177c6cd7997a23fbf666e4d0f00c3a7d55989437eae1cc18955d0d
-size 48701
+oid sha256:0b73c389693004fafa3f51f5c216daada8ab081f9bb3d586c597cd50e7120079
+size 48567
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png
index 5dbded552a..9b42fce88f 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8ad448fbd6f2cee688cc29e5281fb195a52cd6a43476b35c2ee611858782651d
-size 74516
+oid sha256:d2ee97122303e5b239be255f0fd42f4459cec2a0ae320a95f159e7920d5f667d
+size 74328
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png
index b89be0e23a..4225878d21 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:94525dedfe95d84a11a24d9f750f49a75eb199ada1325931c714e2a1e43a1440
-size 80896
+oid sha256:feaf4c4cdfca77795e6c3327a599be889ec4181a54362f1823e8deb092d779ed
+size 80720
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_noLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_noLicense.png
index bd9be0147b..fac412e14a 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_noLicense.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_noLicense.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d128611911d917cf931a0a79f90d491e80dea2001f1dfd041dec0e0a7cdf9c54
-size 17557
+oid sha256:089e579604cc4eec966dfcd9c2c591b29c0ae6e3016aa7776404a69d2dfa9eec
+size 17428
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png
index 9892dc2b47..f15b515e40 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3f1127f3e932cf5f79226d3f24c0aacf93a7662b789c6e980f5f6d3197483942
-size 53807
+oid sha256:0492a19d58e8a94dad2e81dd885af338f6b81c294274c9aba8a20068ac055163
+size 53588
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png
index f752d822fa..78a8305f4d 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6836b2e285eca7d37569be247694a55760b07f9af8a628eeb262790db942aeb4
-size 824077
+oid sha256:3cc756c501bb3b1f03722ae3f0feb29b4883cb95a2f5fd6f1a676fd9b680cb9f
+size 821752
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png
index b81f9c61ad..d66b8cfb0c 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2ceaca148b283b0e26cf2e5f167a267696b8750c42212b41a173d49cf1effd0b
-size 850516
+oid sha256:083d400cf94feb03571dc87d8bddf6c54da5e3e4e03d50d2f434568fdb1dcc9a
+size 848215
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png
index 2a688348f3..a97ede757c 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3875a88ebbb05bbc85360104df643855d02d6f3edffd0fb6c69c770dd6386d0a
-size 16483
+oid sha256:1812491e5f56cd36c5a37ee7c1c09690352a2bcdc96df2666b8983c2c666aa0c
+size 15498
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png
index 735b288c62..61ef3ff1f5 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0ec59bafe93601c798de859666219cc4968566d16f804c5450bc15f9a9d593f6
-size 841530
+oid sha256:34925a1fea456c1030edf370c2f249551a44ed8c1a7c02e42fc5ff07e0a40488
+size 839685
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png
index d89c591ca9..ffa6066394 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8df23b519e18b5e0fab17464e962d878dc664de202c935ece00ede48b6559ec9
-size 13574
+oid sha256:ba88c0b667ba89d571d4b7d76c7ec3e132aba47dddf11e7f7ac9cea3869b4c4a
+size 13233
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png
index d41d44e590..3bd676466c 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:af0b24e96ed09a45506453aba2c5d2ad49d2cf8777f07c0f697b320ff0809a2e
-size 837096
+oid sha256:32ecc3c78b5952bfeb8900bec12a54934e95c32c38abf1ac92fb5c946e6f8fb1
+size 834309
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png
index 72ad13179c..9669c9364d 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1c50bdf911e20232c8ff8c20e57e25a2909f935ee16d0e0cc1b38c3586d84aad
-size 845919
+oid sha256:86bca5a499a238696371c0ba8b5031fe28f3a5acdecc18be801990d66929c98f
+size 843442
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png
index 55a8ceb04d..27728202a6 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8100c2a4030a145d46c1396b0db5b57644150e042e2477705cf715264cd8b826
-size 165095
+oid sha256:f81df66dbe5ac0a178a0d7c619cbe8a2c86d76d1e19ea858067eeb59db94724e
+size 164467
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png
index a3a6923688..69c3af4990 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7c1d95074aa86a8d33c0b583a3ce4cc10e0eb831c11dbba3651a3b6edef52c53
-size 162141
+oid sha256:babb545e93278d12e0d0899a46b4e9e8b42d285f3c9f9a67417b27eb5468f3af
+size 161527
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png
index a2167ae96e..520daa0d7d 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8d35925b43643543741838d9c13858f783d633aad043ca055168b07069afed4a
-size 140327
+oid sha256:eaf80749b8df625ee0072a18d44c7cc53c702fb0e0f89fe2ff032fddf4d046a0
+size 139906
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png
index 471467cb03..23a4d2155d 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1087d60fce3295147b6e6a0cbbb2ffcb25114f6205b2bb1029da1f8997fe06b7
-size 34392
+oid sha256:1f2c89ade13fac9d0b808900ac20466815079ca14b8bcf1ac9abaed59ac79db4
+size 34054
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png
index 690a783807..841400a5bd 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:da6fedb5623359bb700804f00e1aa63ec869fa8d4e636fb4b1c2fcf02b402163
-size 34006
+oid sha256:3b7901e6a6d9ebcab717915d729858fd926132f53ff624ef827b948e5392c408
+size 33694