Skip to content

Commit

Permalink
Merge pull request #257 from Team-Crops/dev
Browse files Browse the repository at this point in the history
mobile에서 꺠지는 부분 핫픽스 적용
  • Loading branch information
jaewoongs authored Aug 7, 2024
2 parents 142a1aa + c5cdd7f commit 6c4fa26
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 7 deletions.
5 changes: 5 additions & 0 deletions src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,17 @@ textarea {

html {
background-color: #fff;
min-width: 1500px;
}

body {
min-width: 1500px;
width: 100vw;
margin: 0 auto;
}
header {
min-width: 1500px;
}

input,
textarea,
Expand Down
2 changes: 1 addition & 1 deletion src/components/atoms/Backdrop.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import styled from '@emotion/styled';

export const Backdrop = styled.div`
position: fixed;
z-index: 100;
z-index: 10000;
top: 0;
left: 0;
Expand Down
3 changes: 1 addition & 2 deletions src/components/organisms/main/IntroProjectBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@ const Block = styled.div`
gap: 80px;
align-items: center;
width: 100vw;
width: 100%;
padding: 20px;
`;
const CardWrapper = styled.div`
position: relative;
display: flex;
flex-wrap: wrap;
gap: 32px;
justify-content: center;
Expand Down
2 changes: 1 addition & 1 deletion src/components/organisms/main/IntroRecommendBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const Block = styled.div`
gap: 80px;
align-items: center;
width: 100vw;
width: 100%;
padding: 20px;
`;

Expand Down
11 changes: 9 additions & 2 deletions src/components/templates/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import { css } from '@emotion/react';
import styled from '@emotion/styled';

import { media } from '#/utilities';
import { HeaderContent } from '#organisms/HeaderContent';

const SpaceCSS = css`
Expand All @@ -13,15 +14,21 @@ const StyledHeader = styled.header`
position: fixed;
z-index: 9999;
padding: 0 20px;
background: #fff;
border-bottom: 1px solid #eee;
padding: 0 20px;
${SpaceCSS}
${media.xxlarge} {
position: relative;
}
`;
const HeaderSpace = styled.div`
${SpaceCSS}
${media.xxlarge} {
display: none;
}
`;

export const Header = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/templates/MainSection3.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const BackgroundImage = styled(Image)`
z-index: -10;
top: -70px;
width: 100vw;
width: 100%;
height: calc(100vw * ${mainSection3Background.height / mainSection3Background.width});
`;

Expand Down

1 comment on commit 6c4fa26

@vercel
Copy link

@vercel vercel bot commented on 6c4fa26 Aug 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

fit-web – ./

fit-web-team-crops-projects.vercel.app
f-it.team
fit-web-git-main-team-crops-projects.vercel.app

Please sign in to comment.