From 308a046b60357312709414ebe9c317610cf18bc3 Mon Sep 17 00:00:00 2001
From: Kevin Foong <55353265+kevin9foong@users.noreply.github.com>
Date: Tue, 1 Oct 2024 14:14:12 +0800
Subject: [PATCH 1/2] fix: logic active step padding (#7737)
fix
: add padding around step items
---
.../EditLogicBlock/EditCondition/EditConditionWrapper.tsx | 1 +
.../components/LogicContent/EditLogicBlock/EditLogicBlock.tsx | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/frontend/src/features/admin-form/create/logic/components/LogicContent/EditLogicBlock/EditCondition/EditConditionWrapper.tsx b/frontend/src/features/admin-form/create/logic/components/LogicContent/EditLogicBlock/EditCondition/EditConditionWrapper.tsx
index 506e488475..37d1420d3f 100644
--- a/frontend/src/features/admin-form/create/logic/components/LogicContent/EditLogicBlock/EditCondition/EditConditionWrapper.tsx
+++ b/frontend/src/features/admin-form/create/logic/components/LogicContent/EditLogicBlock/EditCondition/EditConditionWrapper.tsx
@@ -13,6 +13,7 @@ export const EditConditionWrapper = forwardRef<
ref={ref}
borderRadius="4px"
bg="white"
+ py="1.5rem"
border="1px solid"
borderColor="primary.500"
boxShadow="0 0 0 1px var(--chakra-colors-primary-500)"
diff --git a/frontend/src/features/admin-form/create/logic/components/LogicContent/EditLogicBlock/EditLogicBlock.tsx b/frontend/src/features/admin-form/create/logic/components/LogicContent/EditLogicBlock/EditLogicBlock.tsx
index ec18c050b2..8f807f0ffd 100644
--- a/frontend/src/features/admin-form/create/logic/components/LogicContent/EditLogicBlock/EditLogicBlock.tsx
+++ b/frontend/src/features/admin-form/create/logic/components/LogicContent/EditLogicBlock/EditLogicBlock.tsx
@@ -122,7 +122,7 @@ export const EditLogicBlock = ({
}
direction="column"
- py="1.5rem"
+ pb="1.5rem"
px={{ base: '1.5rem', md: '2rem' }}
>
{logicConditionBlocks.map((block, index) => {
From f427462d3d7a6a24112063369416a7055e753ab1 Mon Sep 17 00:00:00 2001
From: Kevin Foong
Date: Tue, 1 Oct 2024 14:30:03 +0800
Subject: [PATCH 2/2] chore: bump version to 6.149.3
---
CHANGELOG.md | 8 ++++++++
frontend/package-lock.json | 4 ++--
frontend/package.json | 2 +-
package-lock.json | 4 ++--
package.json | 2 +-
5 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 758da0b893..8136d0f99b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,11 +4,19 @@ All notable changes to this project will be documented in this file. Dates are d
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
+#### [v6.149.3](https://github.com/opengovsg/FormSG/compare/v6.149.2...v6.149.3)
+
+- fix: logic active step padding [`#7737`](https://github.com/opengovsg/FormSG/pull/7737)
+- build: release 6.149.2 [`#7734`](https://github.com/opengovsg/FormSG/pull/7734)
+
#### [v6.149.2](https://github.com/opengovsg/FormSG/compare/v6.149.1...v6.149.2)
+> 27 September 2024
+
- fix: ses default configset [`#7733`](https://github.com/opengovsg/FormSG/pull/7733)
- build: release 6.149.1 [`#7729`](https://github.com/opengovsg/FormSG/pull/7729)
- feat: explicitly specify configset [`f4c78cb`](https://github.com/opengovsg/FormSG/commit/f4c78cb0d342bb1c6241602910dc711ee6703815)
+- chore: bump version to 6.149.2 [`e865ad8`](https://github.com/opengovsg/FormSG/commit/e865ad89c862f441b4097b10f9a966033a72f1ce)
#### [v6.149.1](https://github.com/opengovsg/FormSG/compare/v6.149.0...v6.149.1)
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 612cce2f5c..e38b8072ae 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "form-frontend",
- "version": "6.149.2",
+ "version": "6.149.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "form-frontend",
- "version": "6.149.2",
+ "version": "6.149.3",
"hasInstallScript": true,
"dependencies": {
"@chakra-ui/react": "^1.8.6",
diff --git a/frontend/package.json b/frontend/package.json
index 77bfd98626..d7b417d7b9 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "form-frontend",
- "version": "6.149.2",
+ "version": "6.149.3",
"homepage": ".",
"private": true,
"dependencies": {
diff --git a/package-lock.json b/package-lock.json
index 03e3a587c5..2a610f5f5c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "FormSG",
- "version": "6.149.2",
+ "version": "6.149.3",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "FormSG",
- "version": "6.149.2",
+ "version": "6.149.3",
"hasInstallScript": true,
"dependencies": {
"@aws-sdk/client-cloudwatch-logs": "^3.536.0",
diff --git a/package.json b/package.json
index 9762ce36cf..8d049d2b2f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "FormSG",
"description": "Form Manager for Government",
- "version": "6.149.2",
+ "version": "6.149.3",
"homepage": "https://form.gov.sg",
"authors": [
"FormSG "