Skip to content

Commit 7a29636

Browse files
authored
Merge pull request #85 from JS-Ninjaaaa/84-dream-input-align-top
#の入力欄と夢の入力欄を上揃えにした
2 parents 1dfb796 + 685c4ae commit 7a29636

File tree

6 files changed

+20
-7
lines changed

6 files changed

+20
-7
lines changed

frontend/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
},
2727
"devDependencies": {
2828
"@eslint/js": "^9.21.0",
29+
"@tailwindcss/line-clamp": "^0.4.4",
2930
"@types/react": "^19.0.10",
3031
"@types/react-dom": "^19.0.4",
3132
"@vitejs/plugin-react": "^4.3.4",

frontend/pnpm-lock.yaml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/src/pages/dreams/mine/card/MyDreamCard.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,12 @@ const MyDreamCard = ({ dream, setMyDreams }: MyDreamCardProps) => {
3737
<div
3838
className={`
3939
relative rounded-[50px] md:w-[220px] md:h-[220px] w-[240px] h-[240px]
40-
transform transition-transform duration-300
4140
flex flex-col items-center justify-center gap-2
4241
bg-gradient-to-b from-white border-2 border-gray-500
43-
${gradientClass}
42+
${gradientClass}
4443
`}
4544
>
46-
<div className="text-base font-mpulus text-center px-6">
45+
<div className="text-base font-mpulus text-center px-6 mb-1 line-clamp-3">
4746
{dream.content}
4847
</div>
4948
<div className="bg-white rounded-2xl px-4 py-2 flex flex-col items-center">

frontend/src/pages/dreams/mine/form/MyDreamForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const MyDreamInput = ({ setMyDreams }: MyDreamInputProps) => {
4646
<h2 className="text-2xl font-mpulus mb-4 mt-2 ml-3">
4747
あなたの夢を教えてください
4848
</h2>
49-
<div className="flex w-full flex-wrap justify-center items-center px-8">
49+
<div className="flex w-full flex-wrap justify-center items-start px-8">
5050
<MyDreamFormInput content={content} setContent={setContent} />
5151
<MyDreamFormHashtagList hashtags={hashtags} setHashtags={setHashtags} />
5252
</div>

frontend/src/pages/dreams/public/card/PublicDreamCard.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@ const PublicDreamCard = ({ dream, setPublicDreams }: PublicDreamCardProps) => {
2626
className={`
2727
bg-[#fff1fa] relative rounded-[50px]
2828
md:w-[220px] md:h-[220px] w-[240px] h-[240px]
29-
transform transition-transform duration-300
3029
flex flex-col items-center justify-center border-2 border-gray-500
3130
`}
3231
>
33-
<div className="text-base font-mpulus text-center px-6 mb-3">
32+
<div className="text-base font-mpulus text-center px-6 mb-3 line-clamp-3">
3433
{dream.content}
3534
</div>
3635
<div className="bg-white px-4 gap-3 py-2 rounded-2xl flex items-center gap-2">

frontend/tailwind.config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@ module.exports = {
1111
},
1212
},
1313
},
14-
plugins: [],
14+
plugins: [
15+
require('@tailwindcss/line-clamp'),
16+
],
1517
};

0 commit comments

Comments
 (0)