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:
authorLukas Winkler <git@lw1.at>2021-03-26 00:06:07 +0300
committerGitHub <noreply@github.com>2021-03-26 00:06:07 +0300
commit9e265afcf85298b718127167abb108d068b27af0 (patch)
treeb3903f8993513f78db1e14eb3dbe2bfdfd3b1626
parentb1bb297af991a948cbb5ab7af198e3a72cb51e1d (diff)
icon for informational system check (#17389)
* icon for informational system check * also update installation css * update UI tests
-rw-r--r--plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png4
-rw-r--r--plugins/Installation/stylesheets/installation.css4
-rw-r--r--plugins/Installation/stylesheets/systemCheckPage.less6
-rw-r--r--plugins/Installation/templates/_systemCheckSection.twig3
-rw-r--r--plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png4
5 files changed, 15 insertions, 6 deletions
diff --git a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png
index ef70b617a8..1e3dfc3555 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:537abc41c9f56eb9bf976d5105834a4d4eaa6fc4b9718cdd3a8be71d50ab0c93
-size 426942
+oid sha256:3abab46bf7c8af3bb587a8162cc33e0b3f77dee3b78fef43a539066d70d5a4a6
+size 440859
diff --git a/plugins/Installation/stylesheets/installation.css b/plugins/Installation/stylesheets/installation.css
index ee7b985c44..22f1354c8c 100644
--- a/plugins/Installation/stylesheets/installation.css
+++ b/plugins/Installation/stylesheets/installation.css
@@ -121,6 +121,10 @@ p.next-step:first-child {
color: #D73F36;
margin-right: 10px;
}
+.system-check .icon-info2, .system-check-legend .icon-info2 {
+ color: #00bcd4;
+ margin-right: 10px;
+}
.system-check-legend {
font-size: 13px;
diff --git a/plugins/Installation/stylesheets/systemCheckPage.less b/plugins/Installation/stylesheets/systemCheckPage.less
index d0c2293fce..ab65a8cdfa 100644
--- a/plugins/Installation/stylesheets/systemCheckPage.less
+++ b/plugins/Installation/stylesheets/systemCheckPage.less
@@ -30,6 +30,10 @@
color: #D73F36;
margin-right: 10px;
}
+.system-check .icon-info2 {
+ color: #00bcd4;
+ margin-right: 10px;
+}
.widgetBody.system-check {
.icon-ok,
@@ -70,4 +74,4 @@
.system-warnings {
font-weight: bold;
color: #DF9D27 !important;
-} \ No newline at end of file
+}
diff --git a/plugins/Installation/templates/_systemCheckSection.twig b/plugins/Installation/templates/_systemCheckSection.twig
index ff73417a5b..4ea15c45d9 100644
--- a/plugins/Installation/templates/_systemCheckSection.twig
+++ b/plugins/Installation/templates/_systemCheckSection.twig
@@ -63,6 +63,7 @@
{% set errorIcon %} <span class="icon-error"></span> {% endset %}
{% set warningIcon %} <span class="icon-warning"></span> {% endset %}
{% set okIcon %} <span class="icon-ok"></span> {% endset %}
+ {% set infoIcon %} <span class="icon-info2"></span> {% endset %}
{% for result in results %}
<tr>
@@ -75,7 +76,7 @@
{% elseif item.status == warning %}
{{ warningIcon }} {{ item.comment|raw }}
{% elseif item.status == informational %}
- {{ item.comment }}
+ {{ infoIcon }} {{ item.comment }}
{% else %}
{{ okIcon }} {{ item.comment|raw }}
{% endif %}
diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png
index 6d81f1f34d..7528dabf2a 100644
--- a/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png
+++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:212df273f5a832f6a7aa52b5ec9f544ef385f94492e3a1b224de947e8df93f1f
-size 270335
+oid sha256:f20ab8e58403358f7eac9fa3f7e39879a623c9ce376a1af7875ce2d71b37f968
+size 273195