Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev-thomas' into dev-thomas
Browse files Browse the repository at this point in the history
  • Loading branch information
chabauda committed Dec 8, 2023
2 parents 3acebf6 + 315cba3 commit 06c08c0
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 6 deletions.
1 change: 0 additions & 1 deletion ndi2023
Submodule ndi2023 deleted from 69993a
1 change: 0 additions & 1 deletion src/app/antifakenews/page.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import base from "../principal.module.scss";

// TODO: faire un lien vers cette page. l'ancien lien d'eliott pourrait devenir un easter egg psk il est goatesque
export default function antifakenews() {
return (
<div className={base.genericLayout}>
Expand Down
1 change: 0 additions & 1 deletion src/app/conseils/page.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import base from "../principal.module.scss";

// TODO: faire un lien vers cette page
export default function conseils() {
return (
<div className={base.genericLayout}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/slides/SN14.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default function SN14() {
return (
<Degrade color={all.gris} id={14}>
<div className={base.divRoot}>
<h1>Mais dans l&apos;urgence, il faut surtout garder son <span className={"text-white"}>calme</span>.</h1>
<h1>Mais dans l&apos;urgence, il faut surtout garder son <Link href={"/conseils"}><span className={"text-white"}>calme</span></Link>.</h1>
<div className={base.textclass}>
<p>
Effectuez des actions à <span className={"text-white"}>votre échelle</span>. Parlez en à vos proches.
Expand Down
2 changes: 0 additions & 2 deletions src/components/slides/SN15.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import base from "./SN15.module.scss";

export default function SN15() {
return (
// TODO: note à thumus, je pense qu'il faudrait ajuster manuellement la hauteur de la page pour faire ce que je veux faire
// mais j'ai pas envie de tout casser :cryemoji:
<Degrade color={all.gris} id={15}>
<div className={base.divRoot}>
<div className={base.firstHalf}>
Expand Down

0 comments on commit 06c08c0

Please sign in to comment.