Merge pull request #6 from DemocraciaEnRed/main

Deploy - fixes post reunión 11/1
DemocraciaEnRed · Jan 11, 2024 · ad40298 · ad40298
2 parents 1d2d133 + fba8db3
commit ad40298
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/src/app/components/Footer.tsx b/src/app/components/Footer.tsx
@@ -70,7 +70,7 @@ const Footer = () => {
 
       <div className="flex flex-row justify-center items-center">
         <Link href="mailto:[email protected]" target="_blank">
-          <p className="font-raleway">contacto@democraciaenred.com</p>
+          <p className="font-raleway">contacto@democraciaenred.org</p>
         </Link>
       </div>
     </footer>

diff --git a/src/app/components/LandingFlourish.tsx b/src/app/components/LandingFlourish.tsx
@@ -2,7 +2,7 @@ import Image from "next/image"
 
 const LandingFlourish = () => {
     return (
-        <div className="w-[60%] max-lg:w-full">
+        <div className="w-[60%] max-lg:w-full bg-der-black">
             <iframe src='https://flo.uri.sh/story/1969359/embed'
                 title='Interactive or visual content'
                 className='flourish-embed-iframe w-full h-[600px]'

diff --git a/src/app/components/LandingTopics.tsx b/src/app/components/LandingTopics.tsx
@@ -6,7 +6,8 @@ const Card = ({ backgroundColor, title, description }: { backgroundColor: string
 
   return (
     <div
-      className={`h-[260px] w-[389px] bg-[${backgroundColor}] flex flex-col justify-center items-center rounded-md max-[584px]:min-w-[300px] relative overflow-hidden`}
+      className={`h-[260px] w-[389px] flex flex-col justify-center items-center rounded-md max-[584px]:min-w-[300px] relative overflow-hidden`}
+      style={{ backgroundColor }}
       onMouseEnter={() => setShowText(false)}
       onMouseLeave={() => setShowText(true)}
     >

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -80,7 +80,7 @@ export default function RootLayout({
 
   return (
     <html lang="es">
-      <body className={`${nippo.variable} ${raleway.variable} ${roboto.variable} ${lexendDeca.variable} ${inter.variable} ${openSans.className} flex flex-col min-h-[100vh]`}>
+      <body className={`${nippo.variable} ${raleway.variable} ${roboto.variable} ${lexendDeca.variable} ${inter.variable} ${openSans.className} flex flex-col min-h-[100vh] text-white`}>
         <NavBar />
         {children}
         <ScrollTopButton />

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -2,18 +2,19 @@ import Image from 'next/image'
 import SiteMapFooter from "./components/SiteMapFooter"
 import LandingFlourish from './components/LandingFlourish'
 import Link from 'next/link'
-import { flourishImages } from "~/home/index"
 import LandingArticles from './components/LandingArticles'
 import LandingTopics from './components/LandingTopics'
+import { flourishImages } from "~/home/index"
+import derAboutImg from "~/home/DER.png"
 
 export default function Home() {
 
 
   return (
-    <main>
+    <main className='bg-der-black'>
       <div className="relative text-black">
         <video className='w-full' autoPlay loop muted>
-          <source src="https://democraciaenred.github.io/datosenfuga-next/home/background.mp4" type="video/mp4" className='w-full' />
+          <source src={`https://democraciaenred.github.io/datosenfuga-next/home/background.mp4`} type="video/mp4" className='w-full' />
         </video>
         <div className="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 w-full text-center">
           <h1 className="text-6xl font-extrabold mb-4 max-md:text-4xl">#DATOSENFUGA</h1>
@@ -78,7 +79,7 @@ export default function Home() {
         <LandingArticles />
       </section>
       <div className="flex flex-row bg-[#FAFAFA] text-[#212121] h-[600px] max-lg:flex-col">
-        <div className="w-1/2 h-full bg-[url('/home/DER.png')] bg-center bg-no-repeat bg-cover max-lg:w-full" >
+        <div className="w-1/2 h-full bg-center bg-no-repeat bg-cover max-lg:w-full"  style={{ backgroundImage: `url(https://democraciaenred.github.io/datosenfuga-next/home/DER.png)`}}>
 
         </div>
         <div className="w-full lg:w-[50%] py-2 my-11 px-11 max-lg:w-full">