Merge branch 'main' into NDT-533-enable-auto-merge-for-Sprint-Done-PR…

…s-Fix
bcgov · Sep 27, 2024 · 480e17e · 480e17e
2 parents a0f8edf + ccdc544
commit 480e17e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.193.7](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.193.5...v1.193.7) (2024-09-27)
+
+### Bug Fixes
+
+- add a margin to left side nav ([d504b23](https://github.com/bcgov/CONN-CCBC-portal/commit/d504b23b3722e2d793dc47055eee3bd2fe4ef112))
+- cbc edit input focus issue ([ce13c6c](https://github.com/bcgov/CONN-CCBC-portal/commit/ce13c6c0085e7021dfe2ecb2d6b7ceff4567ab4a))
+
 ## [1.193.6](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.193.5...v1.193.6) (2024-09-26)
 
 ### Bug Fixes

diff --git a/app/components/Analyst/NavigationSidebar.tsx b/app/components/Analyst/NavigationSidebar.tsx
@@ -26,6 +26,10 @@ const StyledUpperSection = styled.section`
   color: ${(props) => props.theme.color.navigationBlue};
 `;
 
+const StyledLowerSection = styled.section`
+  margin-top: 1em;
+`;
+
 const NavigationSidebar = () => {
   const router = useRouter();
   const { asPath } = router;
@@ -47,7 +51,7 @@ const NavigationSidebar = () => {
             label="Dashboard"
           />
         </StyledUpperSection>
-        <section>
+        <StyledLowerSection>
           <NavItem
             currentPath={asPath}
             href={`/analyst/application/${applicationId}/summary`}
@@ -84,7 +88,7 @@ const NavigationSidebar = () => {
             icon={faClockRotateLeft}
             label="History"
           />
-        </section>
+        </StyledLowerSection>
       </StyledNav>
     </StyledAside>
   );

diff --git a/db/sqitch.plan b/db/sqitch.plan
@@ -684,3 +684,4 @@ computed_columns/cbc_history 2024-09-03T15:16:07Z Anthony Bushara <anthony@butto
 @1.193.4 2024-09-26T20:12:39Z CCBC Service Account <ccbc@button.is> # release v1.193.4
 @1.193.5 2024-09-26T20:14:22Z CCBC Service Account <ccbc@button.is> # release v1.193.5
 @1.193.6 2024-09-26T21:30:05Z CCBC Service Account <ccbc@button.is> # release v1.193.6
+@1.193.7 2024-09-27T17:07:14Z CCBC Service Account <ccbc@button.is> # release v1.193.7
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CONN-CCBC-portal",
-  "version": "1.193.6",
+  "version": "1.193.7",
   "main": "index.js",
   "repository": "https://github.com/bcgov/CONN-CCBC-portal.git",
   "author": "Romer, Meherzad CITZ:EX <Meherzad.Romer@gov.bc.ca>",