Use materializecss/materialize instead of Dogfalo/materialize (matomo…

…-org#19622) * remove old materialize css * add new materlialize css * update paths of materialize css * fix visibility of normal selects * fix selected in segmentation layer * fix style for disabled selects * update materializecss to 1.2.0 * update/fix some ui tests * update materializecss to 1.2.1 * Apply patch from materializecss/materialize#331 * update expected test files * ignore list elements for modal buttons * update expected test files * update materializecss to 1.2.2 * fix ui test * Update UI test screenshots --------- Co-authored-by: Ben <[email protected]>
cbebry · Mar 28, 2023 · aea8f07 · aea8f07
1 parent 28c9a18
commit aea8f07
Show file tree

Hide file tree

Showing 112 changed files with 4,843 additions and 4,392 deletions.
diff --git a/.github/scripts/clean-build.sh b/.github/scripts/clean-build.sh
@@ -154,11 +154,11 @@ rm -rf node_modules/jquery.scrollto/scrollTo.jquery.json
 rm -rf node_modules/jquery.scrollto/changes.txt
 rm -rf node_modules/jquery.scrollto/demo
 
-rm -rf node_modules/materialize-css/extras
-rm -rf node_modules/materialize-css/js
-rm -rf node_modules/materialize-css/sass
-rm -rf node_modules/materialize-css/dist/js/materialize.js
-rm -rf node_modules/materialize-css/dist/css/materialize.css
+rm -rf node_modules/@materializecss/materialize/extras
+rm -rf node_modules/@materializecss/materialize/js
+rm -rf node_modules/@materializecss/materialize/sass
+rm -rf node_modules/@materializecss/materialize/dist/js/materialize.js
+rm -rf node_modules/@materializecss/materialize/dist/css/materialize.css
 
 rm -rf node_modules/mousetrap/mousetrap.js
 rm -rf node_modules/mousetrap/plugins

diff --git a/.gitignore b/.gitignore
@@ -87,7 +87,7 @@ docker-compose.yml
 !/node_modules/jquery.browser
 !/node_modules/jquery.dotdotdot
 !/node_modules/jquery.scrollto
-!/node_modules/materialize-css
+!/node_modules/@materializecss/materialize
 !/node_modules/mousetrap
 !/node_modules/qrcodejs2
 !/node_modules/sprintf-js

diff --git a/core/AssetManager/UIAssetFetcher.php b/core/AssetManager/UIAssetFetcher.php
@@ -152,7 +152,7 @@ public function getTheme()
         'libs/bower_components/jquery/dist/jquery.min.js' => 'node_modules/jquery/dist/jquery.min.js',
         'libs/bower_components/jquery-ui/ui/minified/jquery-ui.min.js' => 'node_modules/jquery-ui-dist/jquery-ui.min.js',
         "libs/bower_components/sprintf/dist/sprintf.min.js" => "node_modules/sprintf-js/dist/sprintf.min.js",
-        "libs/bower_components/materialize/dist/js/materialize.min.js" => "node_modules/materialize-css/dist/js/materialize.min.js",
+        "libs/bower_components/materialize/dist/js/materialize.min.js" => "node_modules/@materializecss/materialize/dist/js/materialize.min.js",
         "libs/bower_components/jquery.scrollTo/jquery.scrollTo.min.js" => "node_modules/jquery.scrollto/jquery.scrollTo.min.js",
         "libs/bower_components/mousetrap/mousetrap.min.js" => "node_modules/mousetrap/mousetrap.min.js",
         "libs/bower_components/jQuery.dotdotdot/src/js/jquery.dotdotdot.min.js" => "node_modules/jquery.dotdotdot/dist/jquery.dotdotdot.js",
@@ -164,7 +164,7 @@ public function getTheme()
         "libs/jquery/jquery.truncate.js" => null,
 
         "libs/jquery/themes/base/jquery-ui.min.css" => "node_modules/jquery-ui-dist/jquery-ui.min.css",
-        "libs/bower_components/materialize/dist/css/materialize.min.css" => "node_modules/materialize-css/dist/css/materialize.min.css",
+        "libs/bower_components/materialize/dist/css/materialize.min.css" => "node_modules/@materializecss/materialize/dist/css/materialize.min.css",
         "node_modules/jquery-ui-dist/jquery-ui.theme.min.css" => "node_modules/jquery-ui-dist/jquery-ui.theme.min.css",
     ];
 

diff --git a/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php b/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php
@@ -71,7 +71,7 @@ protected function getPriorityOrder()
         return array(
             'node_modules/jquery/dist/jquery.min.js',
             'node_modules/jquery/dist/jquery.js',
-            'node_modules/materialize-css/dist/js/materialize.min.js', // so jquery ui datepicker overrides materializecss
+            'node_modules/@materializecss/materialize/dist/js/materialize.min.js', // so jquery ui datepicker overrides materializecss
             'node_modules/jquery-ui-dist/jquery-ui.min.js',
             'node_modules/jquery-ui-dist/jquery-ui.js',
             "plugins/CoreHome/javascripts/materialize-bc.js",