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:
authorStefan Giehl <stefan@matomo.org>2020-10-14 22:08:46 +0300
committerGitHub <noreply@github.com>2020-10-14 22:08:46 +0300
commitd58aee2106fa78456c26e8dde6e182917ec7e948 (patch)
treebca056da4bf6f372bf4c3e42a191f8f163ca6de7
parent714a21e568a72d7153fdf7912eb8877b8f2bc8aa (diff)
Set minimal height of all textareas to 100px (#16566)
-rw-r--r--plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js4
-rw-r--r--plugins/CorePluginsAdmin/angularjs/plugin-settings/plugin-settings.directive.less1
-rw-r--r--plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png4
-rw-r--r--plugins/Morpheus/stylesheets/general/_forms.less4
-rw-r--r--plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png4
-rw-r--r--plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_global_settings.png4
-rw-r--r--tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png4
-rw-r--r--tests/UI/expected-screenshots/Theme_demo.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png4
9 files changed, 18 insertions, 15 deletions
diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js b/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js
index 53d2fdb5c1..3f322e0da3 100644
--- a/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js
+++ b/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js
@@ -116,11 +116,11 @@
});
} else if (hasUiControl(field, 'textarea')) {
- element.find('textarea').trigger('autoresize');
+ Materialize.textareaAutoResize(element.find('textarea'));
scope.$watch('formField.value', function (val, oldVal) {
if (val !== oldVal) {
$timeout(function () {
- element.find('textarea').trigger('autoresize');
+ Materialize.textareaAutoResize(element.find('textarea'));
});
}
});
diff --git a/plugins/CorePluginsAdmin/angularjs/plugin-settings/plugin-settings.directive.less b/plugins/CorePluginsAdmin/angularjs/plugin-settings/plugin-settings.directive.less
index 1151c6e113..3b86a59aba 100644
--- a/plugins/CorePluginsAdmin/angularjs/plugin-settings/plugin-settings.directive.less
+++ b/plugins/CorePluginsAdmin/angularjs/plugin-settings/plugin-settings.directive.less
@@ -1,7 +1,6 @@
.pluginSettings {
textarea {
display: block;
- min-height: 100px;
}
}
.pluginsSettingsSubmit {
diff --git a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png
index 86ecbf9ede..0c9bff3e1b 100644
--- a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png
+++ b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1abae63d40daf743aa195ed70d536bc560744e17079db2a7090366b010224b43
-size 252367
+oid sha256:b2ef6a0d106665c1158e92c6b2b96b3cfe586b12300d47b56c48e6b499f967e1
+size 254195
diff --git a/plugins/Morpheus/stylesheets/general/_forms.less b/plugins/Morpheus/stylesheets/general/_forms.less
index 9d9d55395a..0991e5af07 100644
--- a/plugins/Morpheus/stylesheets/general/_forms.less
+++ b/plugins/Morpheus/stylesheets/general/_forms.less
@@ -129,4 +129,8 @@ abbr[title] {
.select-wrapper input.select-dropdown:focus {
border-bottom-color: @theme-color-brand;
+}
+
+textarea.materialize-textarea {
+ min-height: 100px;
} \ No newline at end of file
diff --git a/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png b/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png
index d6d2759dc6..58c4dc3cc6 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:7c35dd1236c2a696d42c21337259008a217c99b86f2c70e6d048913416445052
-size 1665459
+oid sha256:f8f6009eb0af31e96c7df196e5d7e2d88a0eb265f2f69a9051d3fa56490de09b
+size 1666022
diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_global_settings.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_global_settings.png
index f73873493d..a5355451c6 100644
--- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_global_settings.png
+++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_global_settings.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:26e52349540afe03371f1a3ea2b8f53eeb6c11e0b5900a25898447688f320f41
-size 246171
+oid sha256:922124586599585bbc71df0f9813ec59ea26e96de538f4d75cb009d4c272fe30
+size 247100
diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
index 8b76985e1a..6bc645751b 100644
--- a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
+++ b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6e45722b793485db47c6e932895c61a7d9d0f5271c358912d81165d7e06df4e8
-size 439198
+oid sha256:2e840f362e069d3e30b3629bf01e6bbf89a3ce23518112af1affd9bcd9818886
+size 440550
diff --git a/tests/UI/expected-screenshots/Theme_demo.png b/tests/UI/expected-screenshots/Theme_demo.png
index e7b75bc227..4fc3718f87 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:a423f5d8851f34eb84ea2372168688fa4474738f1c3e228aae47ca28194db058
-size 1665117
+oid sha256:8c44afafb8cb239b6c1eadd9ef7e5f6806bf4d7975557493fef2b1aa452baf7f
+size 1666005
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png
index c8af40bf83..dcac0c1cb9 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d463f59cff6819609cf61346f4611d3382bdb14aa314cc5234062e07ee2f2318
-size 474656
+oid sha256:d8c49d0de7fca8ea4e426be2927c7d472966a062111537d4360c2577f9a0a544
+size 475796