From 2a57e16bc20f3e6847673419c9e8370b37bbea86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Noco=C5=84?= <mnocon@users.noreply.github.com>
Date: Thu, 29 Oct 2020 17:07:49 +0100
Subject: [PATCH 1/2] [Composer] Set metarepo branch for tests and requirements
 for master branch

---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 4439039866..5d4c51a351 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
         "symfony/asset": "^5.0",
         "symfony/yaml": "^5.0",
         "jms/translation-bundle": "^1.5",
-        "ezsystems/ezplatform-kernel": "~1.2.0@dev",
+        "ezsystems/ezplatform-kernel": "^1.3@dev",
         "ezsystems/ezplatform-content-forms": "^1.0@dev",
         "ezsystems/ezplatform-design-engine": "^3.0@dev",
         "ezsystems/ezplatform-user": "^2.0@dev",
@@ -58,10 +58,10 @@
         "fix-cs": "@php ./vendor/bin/php-cs-fixer fix -v --show-progress=estimating"
     },
     "extra": {
-        "_ezplatform_branch_for_behat_tests": "3.2",
+        "_ezplatform_branch_for_behat_tests": "master",
         "branch-alias": {
-            "dev-tmp_ci_branch": "2.2.x-dev",
-            "dev-master": "2.2.x-dev"
+            "dev-tmp_ci_branch": "2.3.x-dev",
+            "dev-master": "2.3.x-dev"
         }
     }
 }

From 31957c758abcbab03994f827de0b7387bd309bfb Mon Sep 17 00:00:00 2001
From: lukasz_ostafin <ostafin.lucas@gmail.com>
Date: Tue, 20 Oct 2020 14:33:48 +0200
Subject: [PATCH 2/2] EZEE-3324: Form Builder: missing design for checkbox
 field in the Form preview

---
 .../Resources/views/themes/admin/ui/form_fields.html.twig    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
index 408e21a2c1..d76472ba8e 100644
--- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
@@ -69,6 +69,11 @@
     {%- endfor -%}
 {%- endblock -%}
 
+{%- block checkbox_widget -%}
+    {%- set attr = attr|merge({class: 'ez-input ez-input--checkbox'}) -%}
+    {{ parent() }}
+{%- endblock -%}
+
 {%- block trash_item_checkbox_widget -%}
     <input type="checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
 {%- endblock -%}