Skip to content

Commit 760403c

Browse files
authored
Merge pull request #462 from boostcampwm2023/Feature/FE/#461
Feature/FE/#461: 카드 UI 변경
2 parents f186234 + 7cf063d commit 760403c

File tree

3 files changed

+10
-21
lines changed

3 files changed

+10
-21
lines changed

Diff for: frontend/src/components/Card/GroupInfoCard/GroupInfoCard.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ const GroupInfoCard = (props: GroupInfoCardProps) => {
2525
};
2626

2727
const Container = styled.div<{ isHead: boolean }>(({ isHead }) => [
28-
tw`w-4/5 mx-auto px-4 py-2 text-white bg-gray-light font-pretendard`,
28+
tw`w-4/5 mx-auto px-4 py-2 text-white bg-gray-light font-pretendard rounded-[2rem]`,
2929
tw`desktop:(w-[48rem]) h-[34.4rem]`,
30-
tw`mobile:(h-[55rem])`,
3130
css`
3231
position: relative;
3332
transition: transform 0.3s;

Diff for: frontend/src/components/Card/GroupInfoCard/HeadCard/HeadCardContent.tsx

+6-19
Original file line numberDiff line numberDiff line change
@@ -128,42 +128,28 @@ const HeadCardContent = ({
128128

129129
const Content = styled.div([
130130
tw`text-m mt-2 gap-x-2`,
131-
tw`tablet:(gap-x-4 justify-evenly)`,
132-
tw`mobile:(flex-col)`,
133131
css`
134132
display: flex;
135133
`,
136134
]);
137135

138136
const ThemeCard = styled.div([
139-
tw`w-[17.6rem] h-[28rem] bg-gray rounded-[2rem]`,
140-
tw`mobile:(w-[14rem] h-[22.4rem] mx-auto)`,
137+
tw`p-1 w-1/5 aspect-[1/1.6] bg-gray rounded-[2rem]`,
141138
css`
142139
display: flex;
143-
align-items: center;
140+
align-self: flex-start;
144141
justify-content: center;
145142
`,
146143
]);
147144

148-
const ThemeImg = styled.img([
149-
tw`rounded-[0.5rem] w-[15.2rem] h-[24.32rem]`,
150-
tw`mobile:(w-[12rem] h-[19.2rem])`,
151-
]);
145+
const ThemeImg = styled.img([tw`p-2 w-full aspect-[1/1.6]`]);
152146

153-
const ThemeContent = styled.div([
154-
css`
155-
display: flex;
156-
flex-direction: column;
157-
justify-content: space-between;
158-
`,
159-
]);
147+
const ThemeContent = styled.div([tw`w-4/5`]);
160148

161149
const ThemeInfo = styled.div([]);
162150

163151
const List = styled.div([
164-
tw`mb-2 gap-x-8`,
165-
tw`tablet:(gap-x-10)`,
166-
tw`mobile:(gap-x-3)`,
152+
tw`my-1`,
167153
css`
168154
display: flex;
169155
align-items: center;
@@ -237,6 +223,7 @@ const Text = styled.div([
237223
const TitleText = styled.div([
238224
tw`border-[0.1rem] border-white border-solid rounded-[1.5rem] px-2 py-1 h-[8rem] w-[25.6rem]`,
239225
tw`tablet:(max-w-[35.2rem] w-full)`,
226+
tw`mobile:(w-full)`,
240227
css`
241228
display: flex;
242229
align-items: center;

Diff for: frontend/tailwind.config.ts

+3
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ export default {
112112
'orange': '#e3651d',
113113
'border-default': '#5F6E76',
114114
},
115+
aspectRatio: {
116+
'1/6': '1 / 1.618',
117+
},
115118
},
116119
},
117120
plugins: [],

0 commit comments

Comments
 (0)