File tree Expand file tree Collapse file tree 1 file changed +20
-0
lines changed
2025/src/components/Staff Expand file tree Collapse file tree 1 file changed +20
-0
lines changed Original file line number Diff line number Diff line change @@ -4,17 +4,37 @@ import StaffCard from "./StaffCard.astro";
4
4
5
5
<section id =" staff" class =" bg-emerald-50 py-6 sm:py-8 md:py-12 lg:py-16" >
6
6
<div class =" container mx-auto px-4" >
7
+ <<<<<<< HEAD
7
8
<div class =" mb-6 text-center sm:mb-8" >
8
9
<h2
9
10
class =" mb-2 text-xl font-bold text-gray-900 sm:mb-3 sm:text-2xl md:text-3xl"
10
11
>
12
+ ||||||| parent of 19e2be7 (feat: レスポンシブ対応)
13
+ <div class =" mb-8 text-center" >
14
+ <h2 class =" mb-3 text-2xl font-bold text-gray-900 md:text-3xl" >
15
+ =======
16
+ <div class =" mb-6 sm:mb-8 text-center" >
17
+ <h2 class =" mb-2 sm:mb-3 text-xl sm:text-2xl font-bold text-gray-900 md:text-3xl" >
18
+ >>>>>>> 19e2be7 (feat: レスポンシブ対応)
11
19
スタッフ
12
20
</h2 >
21
+ <<<<<<< HEAD
13
22
<div class =" mx-auto h-1 w-12 bg-emerald-500 sm:w-16" ></div >
23
+ ||||||| parent of 19e2be7 (feat: レスポンシブ対応)
24
+ <div class =" mx-auto h-1 w-16 bg-emerald-500" ></div >
25
+ =======
26
+ <div class =" mx-auto h-1 w-12 sm:w-16 bg-emerald-500" ></div >
27
+ >>>>>>> 19e2be7 (feat: レスポンシブ対応)
14
28
</div >
29
+ <<<<<<< HEAD
15
30
<div
16
31
class =" xs:grid-cols-2 grid grid-cols-1 gap-3 sm:grid-cols-3 sm:gap-4 md:grid-cols-4 lg:grid-cols-5 xl:grid-cols-6"
17
32
>
33
+ ||||||| parent of 19e2be7 (feat: レスポンシブ対応)
34
+ <div class =" grid grid-cols-2 gap-4 sm:grid-cols-3 md:grid-cols-6" >
35
+ =======
36
+ <div class =" grid grid-cols-1 xs:grid-cols-2 gap-3 sm:gap-4 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 xl:grid-cols-6" >
37
+ >>>>>>> 19e2be7 (feat: レスポンシブ対応)
18
38
<StaffCard
19
39
name =" Tatsuhiro Ujihisa"
20
40
image =" https://github.com/ujihisa.png"
You can’t perform that action at this time.
0 commit comments