diff options
author | Stefan Giehl <stefan@matomo.org> | 2022-01-07 16:21:13 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-07 16:21:13 +0300 |
commit | d5d91db688dd1e2528a3dbea5f32a5a176af520f (patch) | |
tree | 9db50decac3be986c2cb81dd58735f0ce3b7a498 | |
parent | 88797d70be882db2a56cd876fed1063fc1cd929c (diff) |
Fixes some smaller UI regressions (#18589)
* fix some UI regressions
* updates expected UI test files
6 files changed, 10 insertions, 13 deletions
diff --git a/plugins/CoreHome/vue/src/Progressbar/Progressbar.less b/plugins/CoreHome/vue/src/Progressbar/Progressbar.less index 36e7ddef0a..70a02c8247 100644 --- a/plugins/CoreHome/vue/src/Progressbar/Progressbar.less +++ b/plugins/CoreHome/vue/src/Progressbar/Progressbar.less @@ -1,7 +1,3 @@ .progressbar { margin: 22px 24px; - - span.label { - margin-left: 4.5px; - } }
\ No newline at end of file diff --git a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png index a90a3cb0c1..d76d11b63c 100644 --- a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png +++ b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1c89044bbe88c5bd129c6c4e4918d94f95a22da6925dd6aee4cceb9511ea2ca -size 468220 +oid sha256:ed7e180aedce222419a58c1a6dbae308adb96be06f7ea7a47175444ed36d1a0f +size 466693 diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index a26a42fe1b..413d77aeb6 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -118,6 +118,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin /** @var DiagnosticService $diagnosticService */ $diagnosticService = StaticContainer::get('Piwik\Plugins\Diagnostics\DiagnosticService'); $view->diagnosticReport = $diagnosticService->runDiagnostics(); + $view->isInstallation = true; $view->showNextStep = !$view->diagnosticReport->hasErrors(); diff --git a/plugins/Installation/templates/_systemCheckSection.twig b/plugins/Installation/templates/_systemCheckSection.twig index a956d411ac..1fe5d0b3e5 100644 --- a/plugins/Installation/templates/_systemCheckSection.twig +++ b/plugins/Installation/templates/_systemCheckSection.twig @@ -41,19 +41,19 @@ </details> </textarea> -<table class="entityTable system-check" id="systemCheckRequired"> +<table class="entityTable system-check" id="systemCheckRequired" {% if isInstallation is not defined %}piwik-content-table{% endif %}> {{ local.diagnosticTable(diagnosticReport.getMandatoryDiagnosticResults()) }} </table> <h3>{{ 'Installation_Optional'|translate }}</h3> -<table class="entityTable system-check" id="systemCheckOptional"> +<table class="entityTable system-check" id="systemCheckOptional" {% if isInstallation is not defined %}piwik-content-table{% endif %}> {{ local.diagnosticTable(diagnosticReport.getOptionalDiagnosticResults()) }} </table> <h3>{{ 'Installation_InformationalResults'|translate }}</h3> -<table class="entityTable system-check" id="systemCheckInformational"> +<table class="entityTable system-check" id="systemCheckInformational" {% if isInstallation is not defined %}piwik-content-table{% endif %}> {{ local.diagnosticTable(diagnosticReport.getInformationalResults()) }} </table> diff --git a/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png b/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png index 1ce1823330..faf3bd63a1 100644 --- a/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png +++ b/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a404d0f6329ee150b631a02d5516b6b4addfc225254169fa801d0a2780a556b -size 1672067 +oid sha256:0f458b527e21cf7df95d57675977be9dc849628962d70d63c86d6246e26e43de +size 1672113 diff --git a/tests/UI/expected-screenshots/Theme_demo.png b/tests/UI/expected-screenshots/Theme_demo.png index 761274c73a..34169ba256 100644 --- a/tests/UI/expected-screenshots/Theme_demo.png +++ b/tests/UI/expected-screenshots/Theme_demo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e446758964cecba113322fd7bf8c0032d6e0e2f9ab5214138445085ad68836d6 -size 1672087 +oid sha256:43685c811b492c8566056d1fd532853c383e33eba41b810620c19aac86d837ac +size 1672106 |