fix: 미흡한 부분 수정

Ocean-Portfolio · Jun 2, 2024 · bf0f250 · bf0f250
1 parent 4d14956
commit bf0f250
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/components/Card/History/HistoryCard.css.ts b/src/components/Card/History/HistoryCard.css.ts
@@ -52,10 +52,10 @@ export const wrapStyle = style([
         padding: '1.5rem 0.875rem',
       },
       [ODSBreakpointTokenVariables['breakpoint-l']]: {
-        height: '7.75rem',
         padding: '0.875rem 1.5rem',
       },
       [ODSBreakpointTokenVariables['breakpoint-s']]: {
+        height: 'auto',
         gap: '0.25rem',
         padding: '0.75rem',
         borderRadius: '0.5rem',

diff --git a/src/components/Card/Project/ProjectCard.css.ts b/src/components/Card/Project/ProjectCard.css.ts
@@ -36,17 +36,23 @@ export const wrapVariants = styleVariants({
 
 export const sizeStyle = style({
   width: '25.5rem',
+  minWidth: '25.5rem',
   height: '25rem',
+  minHeight: '25rem',
 
   '@media': {
     [ODSBreakpointTokenVariables['breakpoint-l']]: {
       width: '22.5rem',
+      minWidth: '22.5rem',
       height: '22.5rem',
+      minHeight: '22.5rem',
     },
 
     [ODSBreakpointTokenVariables['breakpoint-m']]: {
       width: '17.5rem',
+      minWidth: '17.5rem',
       height: '22.5rem',
+      minHeight: '22.5rem',
     },
   },
 });

diff --git a/src/components/NormalProject/NormalProject.tsx b/src/components/NormalProject/NormalProject.tsx
@@ -58,11 +58,7 @@ const NormalProject = ({ projectData, userAgent, userInfo }: Props) => {
         value={{ isMouseInSection, projectData, userAgent, userInfo }}
       >
         <NormalProject.Wrap>
-          {projectData.length > 4 ? (
-            <NormalProject.Swiper />
-          ) : (
-            <NormalProject.Content />
-          )}
+          <NormalProject.Swiper />
         </NormalProject.Wrap>
       </ContextValueNormalProject.Provider>
     </ContextDispatchNormalProject.Provider>
@@ -225,6 +221,7 @@ const Swiper = () => {
       <OceanSwiper.Main
         hiddenNavigation
         swiperKey={customEvents.SWIPER_KEY.NORMAL_PROJECT}
+        pagination={false}
       >
         {displayData.map((projects, idx1) => {
           return (

diff --git a/src/styles/global.css.ts b/src/styles/global.css.ts
@@ -29,6 +29,10 @@ globalStyle('html, body', {
   maxWidth: '100vw',
 });
 
+globalStyle('body', {
+  overflowX: 'hidden',
+});
+
 globalStyle('button', {
   border: 'none',
   outline: 'none',