Merge pull request #1143 from data-for-change/bug-1136-axis-partial

modify content margin,height,width
data-for-change · Oct 22, 2024 · 05b8f6b · 05b8f6b
2 parents 926853b + 513611e
commit 05b8f6b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/components/molecules/card/AnyWayCard.tsx b/src/components/molecules/card/AnyWayCard.tsx
@@ -54,7 +54,11 @@ const useStyles = makeStyles((theme) => ({
     color: (theme.palette.primary as ColorScheme).fontColor,
   },
   content: {
-    height: '100%',
+    height: 'calc(100% - 20px)',
+    width: 'calc(100% - 40px)',
+    marginTop: '20px',
+    marginLeft: 'auto',
+    marginRight: 'auto',
     boxSizing: 'border-box',
     padding: 0,
     backgroundColor: (theme.palette.primary as ColorScheme).containerColor,

diff --git a/src/components/molecules/card/card.util.ts b/src/components/molecules/card/card.util.ts
@@ -14,7 +14,7 @@ export function getSizes(variant: CardVariant, factor: number): CardSizes {
   const width = cardWidth * factor;
   const headerHeight = variant.header === HeaderVariant.None ? 0 : cardHeaderHeight * factor;
   const footerHeight = variant.footer === FooterVariant.None ? 0 : cardFooterHeight * factor;
-  const contentHeight = height - headerHeight - 2 * footerHeight;
+  const contentHeight = height - headerHeight - footerHeight;
 
   return {
     height,