diff --git a/.editorconfig b/.editorconfig index e2aa47d23..97f482d6c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -34,6 +34,10 @@ trim_trailing_whitespace = false indent_style = space indent_size = 4 +[*.scss] +indent_style = space +indent_size = 2 + [*.sh] indent_style = tab indent_size = 4 diff --git a/assets/js/app/editor/Components/Collection.vue b/assets/js/app/editor/Components/Collection.vue index d69b700dc..a8d0e85d2 100644 --- a/assets/js/app/editor/Components/Collection.vue +++ b/assets/js/app/editor/Components/Collection.vue @@ -15,25 +15,28 @@ -
|taxonomies
filter with a parameter of type '%s', but |taxonomies
accepts record (Content).", gettype($content));
$this->notifications->warning('Incorrect use of |taxonomies
filter', $body);
+
+ return new Collection();
}
$taxonomies = [];
diff --git a/templates/_partials/fields/simple_image.html.twig b/templates/_partials/fields/simple_image.html.twig
new file mode 100644
index 000000000..6b880c68f
--- /dev/null
+++ b/templates/_partials/fields/simple_image.html.twig
@@ -0,0 +1,83 @@
+{# {% extends '@bolt/_partials/fields/_base.html.twig' %}
+
+{% set extensions = field.definition.get('extensions')|default('') %}
+{% set info %}
+ {{ 'upload.allow_file_types'|trans }}: {{ extensions|join('
, ') }}
{{ extensions|join('
, ') }}