Merge branch 'v4' into feature/add-select-options-sublabel

glints-dev · Jun 6, 2024 · 3054a29 · 3054a29
2 parents 901f9f2 + f951dea
commit 3054a29
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "glints-aries",
-  "version": "4.0.382",
+  "version": "4.0.383",
   "description": "Glints ui-kit for frontend",
   "main": "./lib/index.js",
   "module": "./es/index.js",

diff --git a/src/@next/SideSheet/SideSheetStyle.ts b/src/@next/SideSheet/SideSheetStyle.ts
@@ -84,11 +84,12 @@ export const StyledSideSheetHeader = styled.div`
   display: flex;
   align-items: top;
   padding: 16px 20px;
+  gap: 8px;
 `;
 
 export const StyledButtonContainer = styled.div`
   cursor: pointer;
-  margin: 4px 8px 4px 0px;
+  margin-top: 3px;
   svg {
     width: 24px;
     fill: ${Neutral.B40};
@@ -97,6 +98,8 @@ export const StyledButtonContainer = styled.div`
 
 export const StyledRightContainer = styled.div`
   margin-left: auto;
+  display: flex;
+  align-items: top;
 `;
 
 export const StyledHorizontalLine = styled.hr`

diff --git a/...desheet/sidesheet.spec.ts-snapshots/sidesheet-no-back-button-chromium-linux.png b/...desheet/sidesheet.spec.ts-snapshots/sidesheet-no-back-button-chromium-linux.png
diff --git a/...esheet/sidesheet.spec.ts-snapshots/sidesheet-no-close-button-chromium-linux.png b/...esheet/sidesheet.spec.ts-snapshots/sidesheet-no-close-button-chromium-linux.png
diff --git a/test/e2e/sidesheet/sidesheet.spec.ts-snapshots/sidesheet-open-chromium-linux.png b/test/e2e/sidesheet/sidesheet.spec.ts-snapshots/sidesheet-open-chromium-linux.png
diff --git a/...2e/sidesheet/sidesheet.spec.ts-snapshots/sidesheet-with-tabs-chromium-linux.png b/...2e/sidesheet/sidesheet.spec.ts-snapshots/sidesheet-with-tabs-chromium-linux.png