Skip to content

Commit

Permalink
conflit resolu
Browse files Browse the repository at this point in the history
  • Loading branch information
beliott committed Dec 8, 2023
1 parent ff7d829 commit cea3b5b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 38 deletions.
21 changes: 0 additions & 21 deletions components/slides/SN12.js

This file was deleted.

36 changes: 19 additions & 17 deletions src/components/slides/SN12.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
import all from "../../variables.module.scss";
import Degrade from "../Degrade";
import Image from "next/image";
import base from "./SN12.module.scss";
import all from "../../variables.module.scss"
import Degrade from "../Degrade"
import Image from "next/image"
import base from "./SN12.module.scss"
import FlecheSuiv from "../FlecheSuiv"

export default function SN12() {
return (
<Degrade color={all.noir} gradientStart={all["gradientM-N"]} id={12}>
<div className={base.centerDiv}>
<Image
src="/img/feu.jpg"
alt="Une photo d'un feu placé au centre de l'écran."
width="700"
height="700"
/>
</div>
</Degrade>
);
}
return (
<Degrade color={all.noir} gradientStart={all["gradientM-N"]}>

<div className={base.centerDiv}>

<div className={base.parent}>
<Image src="/img/feu.jpg" alt="Une photo d'un feu placé au centre de l'écran." layout="fill" className={base.image}/>
</div>

</div>

</Degrade>
)
}

0 comments on commit cea3b5b

Please sign in to comment.