From eb28d91dc8aab3b48a4d25938d9c5a40266f8b15 Mon Sep 17 00:00:00 2001 From: sleepndraw Date: Thu, 20 Jun 2024 14:17:57 +0200 Subject: [PATCH 01/10] prueba imgs --- app/sass/lib/_type.sass | 5 ++++- app/sass/partials/_contact.sass | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/sass/lib/_type.sass b/app/sass/lib/_type.sass index a7bd358..3cde701 100644 --- a/app/sass/lib/_type.sass +++ b/app/sass/lib/_type.sass @@ -21,7 +21,7 @@ $sm-text: 16px, 18px, 20px, 400, 140%, 1rem, 0.6rem //h5 $md-text: 18px, 20px, 22px, 400, 140%, 1rem //h4 $lg-text: 22px, 26px, 30px, 400,140%, 1rem //h3 $xl-text: 23px, 30px, 36px, 300, 140%, 1rem //h2 -$xxl-text: 28px, 36px, 42px, 300, 140%, 1rem //h1 +$xxl-text: 28px, 36px, 42px, 600, 140%, 1rem //h1 $slim-weight: 500 $regular:400 @@ -133,18 +133,21 @@ p, label, input, select font-size: nth($body-text,1) line-height: nth($body-text,5) font-weight: nth($body-text,4) + @apply text-gray-100 //margin-bottom: nth($body-text,6) @media screen and (min-width: 640px) font-family: $main_font, sans-serif font-size: nth($body-text,2) line-height: nth($body-text,5) font-weight: nth($body-text,4) + @apply text-gray-100 //margin-bottom: nth($body-text,6) @media screen and (min-width: 1400px) font-family: $main_font, sans-serif font-size: nth($body-text,3) line-height: nth($body-text,5) font-weight: nth($body-text,4) + @apply text-gray-100 //margin-bottom: nth($body-text,6) // texto pequeño diff --git a/app/sass/partials/_contact.sass b/app/sass/partials/_contact.sass index 95c2183..df68ad6 100644 --- a/app/sass/partials/_contact.sass +++ b/app/sass/partials/_contact.sass @@ -1,7 +1,9 @@ .about + .banner main padding-bottom: $spacing-lg + .about_description .contact_info display: flex From e42c950f6f7815b8dfaefe0799a7800b1dde0b90 Mon Sep 17 00:00:00 2001 From: sleepndraw Date: Thu, 20 Jun 2024 14:31:47 +0200 Subject: [PATCH 02/10] prueba imgs --- app/sass/partials/_home.sass | 2 +- public/assets/img/{banner_prov.svg => banner-prov.svg} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename public/assets/img/{banner_prov.svg => banner-prov.svg} (100%) diff --git a/app/sass/partials/_home.sass b/app/sass/partials/_home.sass index d765812..04f30d9 100644 --- a/app/sass/partials/_home.sass +++ b/app/sass/partials/_home.sass @@ -59,7 +59,7 @@ //scale:1.5 opacity: 45% z-index:0 - background-image: url("/assets/img/banner_prov.svg") + background-image: url("/assets/img/banner-prov.svg") margin: -6vh 0 0 background-size: cover background-position: 70% 0 diff --git a/public/assets/img/banner_prov.svg b/public/assets/img/banner-prov.svg similarity index 100% rename from public/assets/img/banner_prov.svg rename to public/assets/img/banner-prov.svg From ad1bcad66087f2d131d1c5fdf059d3e527c4d52d Mon Sep 17 00:00:00 2001 From: sleepndraw Date: Thu, 20 Jun 2024 14:54:02 +0200 Subject: [PATCH 03/10] prueba carga imagenes 2 --- app/page.js | 2 +- next.config.mjs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/page.js b/app/page.js index 8bd039c..54cdf5f 100644 --- a/app/page.js +++ b/app/page.js @@ -35,7 +35,7 @@ export default function Home() {

{t("front.title")}

) : null} diff --git a/app/sass/lib/_mixins.sass b/app/sass/lib/_mixins.sass index 0df19d6..12c10ea 100644 --- a/app/sass/lib/_mixins.sass +++ b/app/sass/lib/_mixins.sass @@ -292,7 +292,7 @@ .banner padding-top: 46px height: 7.4em - background-image: url("/assets/img/headers/projects-banner-phone.svg") + //background-image: url("/assets/img/headers/projects-banner-phone.svg") background-size: cover background-position: center background-repeat: no-repeat @@ -302,7 +302,7 @@ h1 color: white #banner-publications - background-image: url("/assets/img/headers/publications-banner-phone.svg") + //background-image: url("/assets/img/headers/publications-banner-phone.svg") .parallax__layer padding-top: 44px @media (min-width:$min-tablet-width-en) @@ -310,9 +310,9 @@ padding-top: 112px height: 14vw width: 100% - background-image: url("/assets/img/headers/projects-banner-desktop.svg") + //background-image: url("/assets/img/headers/projects-banner-desktop.svg") #banner-publications - background-image: url("/assets/img/headers/publications-banner-desktop.svg") + //background-image: url("/assets/img/headers/publications-banner-desktop.svg") .parallax__layer padding-top: 98px diff --git a/app/sass/partials/_home.sass b/app/sass/partials/_home.sass index d765812..602a343 100644 --- a/app/sass/partials/_home.sass +++ b/app/sass/partials/_home.sass @@ -10,13 +10,11 @@ display: flex justify-content: space-between height: 50vh + margin-top: 6rem h3 @apply text-ca_blue-700 margin-bottom: 2rem - p - margin-bottom: 2rem - width:80% .project_description background-image: url("/assets/img/section_description_home.png") background-size: cover @@ -33,6 +31,9 @@ h5 text-align: center max-width: 70vw + p + margin-bottom: 2rem + width:100% .group_description z-index:100 @@ -122,6 +123,10 @@ display: flex justify-content: space-between height: 60vh + margin-top: 8rem + .project_description + p + width:80% .group_description width: 100vw .logo_home @@ -148,7 +153,10 @@ display: flex justify-content: space-between height: 100vh - + .project_description + p + width:80% + .group_description .logo_home height: 4rem diff --git a/components/Footer.js b/components/Footer.js index 2aee519..1ca2a33 100644 --- a/components/Footer.js +++ b/components/Footer.js @@ -21,7 +21,7 @@ export default function Footer(props) { { route: "/research", key: "nav.item" }, { route: "/courses", key: "nav.item2" }, { route: "/tools", key: "nav.item3" }, - { route: "/projects", key: "nav.item4" }, + { route: "/project", key: "nav.item4" }, { route: "/team", key: "nav.item5" }, { route: "/about", key: "nav.item6" }, ]; diff --git a/components/Header.js b/components/Header.js index afce89e..c6aa2f9 100644 --- a/components/Header.js +++ b/components/Header.js @@ -75,6 +75,7 @@ export default function Header(props) { >
    {routes.map((route, index) => ( +
  • Date: Thu, 20 Jun 2024 15:00:55 +0200 Subject: [PATCH 05/10] prueba carga de imagenes 3 --- components/Header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Header.js b/components/Header.js index afce89e..667a806 100644 --- a/components/Header.js +++ b/components/Header.js @@ -36,7 +36,7 @@ export default function Header(props) {
    logo
    From dd4a21dbac08d2717936dff4d073d7cc7e55f7c1 Mon Sep 17 00:00:00 2001 From: clara7227 Date: Fri, 21 Jun 2024 10:45:37 +0200 Subject: [PATCH 06/10] prueba a ver si se cargan las img en la pagina --- app/sass/partials/_home.sass | 4 ++-- components/Footer.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/sass/partials/_home.sass b/app/sass/partials/_home.sass index c9b0cf7..2bfb4e5 100644 --- a/app/sass/partials/_home.sass +++ b/app/sass/partials/_home.sass @@ -16,7 +16,7 @@ margin-bottom: 2rem .project_description - background-image: url("/assets/img/section_description_home.png") + background-image: url("assets/img/section_description_home.png") background-size: cover background-position: center background-repeat: no-repeat @@ -60,7 +60,7 @@ //scale:1.5 opacity: 45% z-index:0 - background-image: url("/assets/img/banner-prov.svg") + background-image: url("assets/img/banner-prov.svg") margin: -6vh 0 0 background-size: cover background-position: 70% 0 diff --git a/components/Footer.js b/components/Footer.js index 1ca2a33..f9642c0 100644 --- a/components/Footer.js +++ b/components/Footer.js @@ -73,7 +73,7 @@ export default function Footer(props) {

    {t("footer.title2")}

    logo
@@ -84,12 +84,12 @@ export default function Footer(props) {
logo logo
From c94a65dfef6312791308b69b63001002e39bd7b4 Mon Sep 17 00:00:00 2001 From: clara7227 Date: Fri, 21 Jun 2024 10:55:20 +0200 Subject: [PATCH 07/10] prueba 2 --- app/sass/partials/_home.sass | 4 ++-- components/Footer.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/sass/partials/_home.sass b/app/sass/partials/_home.sass index 2bfb4e5..c9b0cf7 100644 --- a/app/sass/partials/_home.sass +++ b/app/sass/partials/_home.sass @@ -16,7 +16,7 @@ margin-bottom: 2rem .project_description - background-image: url("assets/img/section_description_home.png") + background-image: url("/assets/img/section_description_home.png") background-size: cover background-position: center background-repeat: no-repeat @@ -60,7 +60,7 @@ //scale:1.5 opacity: 45% z-index:0 - background-image: url("assets/img/banner-prov.svg") + background-image: url("/assets/img/banner-prov.svg") margin: -6vh 0 0 background-size: cover background-position: 70% 0 diff --git a/components/Footer.js b/components/Footer.js index f9642c0..5605e24 100644 --- a/components/Footer.js +++ b/components/Footer.js @@ -82,6 +82,7 @@ export default function Footer(props) {

{t("footer.title3")}

+ logo +
+
{/* From 55300295a5b3536ab388685404ecb71fd2d9af70 Mon Sep 17 00:00:00 2001 From: clara7227 Date: Fri, 21 Jun 2024 11:00:56 +0200 Subject: [PATCH 08/10] vuelta atras --- components/Footer.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/components/Footer.js b/components/Footer.js index 5605e24..1ed5b53 100644 --- a/components/Footer.js +++ b/components/Footer.js @@ -82,7 +82,7 @@ export default function Footer(props) {

{t("footer.title3")}

-
{/* From e817bbd7820576915ca9e151b44f8c50cc49111f Mon Sep 17 00:00:00 2001 From: sleepndraw Date: Fri, 21 Jun 2024 13:45:35 +0200 Subject: [PATCH 09/10] prueba config imagenes --- next.config.mjs | 69 +++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/next.config.mjs b/next.config.mjs index 5463c52..1c03c07 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -1,31 +1,44 @@ /** @type {import('next').NextConfig} */ +const isProd = process.env.NODE_ENV === 'production'; + const nextConfig = { - /** - * Enable static exports for the App Router. - * - * @see https://nextjs.org/docs/app/building-your-application/deploying/static-exports - */ - output: "export", + /** + * Enable static exports for the App Router. + * + * @see https://nextjs.org/docs/app/building-your-application/deploying/static-exports + */ + output: "export", + + /** + * Set base path. This is the slug of your GitHub repository. + * + * @see https://nextjs.org/docs/app/api-reference/next-config-js/basePath + */ + basePath: isProd ? '/fun4date' : '', + + /** + * Set asset prefix. This is the URL prefix for assets. + * + * @see https://nextjs.org/docs/api-reference/next.config.js/cdn-support-with-asset-prefix + */ + assetPrefix: isProd ? '/fun4date/' : '', + + /** + * Disable server-based image optimization. Next.js does not support + * dynamic features with static exports. + * + * @see https://nextjs.org/docs/app/api-reference/components/image#unoptimized + */ + images: { + unoptimized: true, + }, - /** - * Set base path. This is the slug of your GitHub repository. - * - * @see https://nextjs.org/docs/app/api-reference/next-config-js/basePath - */ - basePath: "", - - /** - * Disable server-based image optimization. Next.js does not support - * dynamic features with static exports. - * - * @see https://nextjs.org/docs/app/api-reference/components/image#unoptimized - */ - images: { - unoptimized: true, - }, - env: { - PUBLIC_URL: "https://ging.github.io/fun4date/" - } - }; - - export default nextConfig; \ No newline at end of file + /** + * Environment variables + */ + env: { + PUBLIC_URL: isProd ? "https://ging.github.io/fun4date/" : "", + } +}; + +export default nextConfig; From f4f7c24e83e21ea63af6ac9b752dcb17631b85c3 Mon Sep 17 00:00:00 2001 From: clara7227 Date: Fri, 21 Jun 2024 15:14:10 +0200 Subject: [PATCH 10/10] 3/4 de la pagina de the project. --- app/page.js | 6 ++-- app/project/page.js | 37 ++++++++++++++++---- app/sass/components/_icons.sass | 25 +++++++++++++ app/sass/lib/_mixins.sass | 36 ++++++++++--------- app/sass/lib/_structure.sass | 10 ++++-- app/sass/lib/_type.sass | 38 +++++++++----------- app/sass/lib/_variables.sass | 16 ++++++--- app/sass/main.scss | 7 ++-- app/sass/partials/_footer.sass | 2 +- app/sass/partials/_home.sass | 17 +++++---- app/sass/partials/_project.sass | 17 +++++++++ app/sass/partials/_publications.sass | 8 ++--- constants/langs/en.js | 5 ++- constants/langs/es.js | 5 ++- tailwind.config.js | 52 +++++++++++++++++++--------- 15 files changed, 193 insertions(+), 88 deletions(-) create mode 100644 app/sass/components/_icons.sass create mode 100644 app/sass/partials/_project.sass diff --git a/app/page.js b/app/page.js index 1f46234..5f4b420 100644 --- a/app/page.js +++ b/app/page.js @@ -34,7 +34,7 @@ export default function Home() {

{t("front.title")}

@@ -56,8 +56,8 @@ export default function Home() {

{t("front.projectDescription")}

-
-
+
+

{t("front.sectionHomeTitle")}

diff --git a/app/project/page.js b/app/project/page.js index d1744aa..19a70fd 100644 --- a/app/project/page.js +++ b/app/project/page.js @@ -7,7 +7,8 @@ import Link from "next/link"; import ProjectCard from "@/components/projectCard"; import { myprojectCards } from "@/constants/projectsCards.js"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { faArrowRight } from "@fortawesome/free-solid-svg-icons"; +import { faCircleNodes } from "@fortawesome/free-solid-svg-icons"; +import { faGrip } from "@fortawesome/free-solid-svg-icons"; import { useTranslation } from "react-i18next"; export default function Projects() { @@ -21,19 +22,43 @@ export default function Projects() { return (
-
-
+
+

{t("project.Intro.sectionTitle")}

{t("project.Intro.sectionBody")}

-

+

{t("project.Intro.sectionHighlight")}

-
-

{t("project.Goals.sectionTitle")}

+
+

{t("project.Goals.sectionTitle")}

+
+
+ +
+

{t("project.Goals.Goal1.GoalTitle")}

+

{t("project.Goals.Goal1.GoalBody")}

+
+
+
+ +
+

{t("project.Goals.Goal2.GoalTitle")}

+

{t("project.Goals.Goal2.GoalBody")}

+
+
+ +
+
+ +
+
+

{t("project.Impact.sectionTitle")}

+

{t("project.Impact.sectionBody")}

+

{t("projects.title")}

diff --git a/app/sass/components/_icons.sass b/app/sass/components/_icons.sass new file mode 100644 index 0000000..05d1d4d --- /dev/null +++ b/app/sass/components/_icons.sass @@ -0,0 +1,25 @@ +@mixin icon_circle + + @apply bg-backgroundSecondary + border-radius: 50px + @apply text-slate-400 + + @media (min-width: $min-phone-width) + height: 1.5rem + width: 1.5rem + padding: 0.7rem + @media (min-width: $min-tablet-width) + height: 2.2rem + width: 2.2rem + padding: 1.3rem + @media (min-width: $min-desktop-width) + height: 2.4rem + width: 2.4rem + padding: 1.3rem + @media (min-width: $min-xl-desktop-width) + height: 2.8rem + width: 2.8rem + padding: 1.3rem + +.icon_circle + @include icon_circle diff --git a/app/sass/lib/_mixins.sass b/app/sass/lib/_mixins.sass index 12c10ea..f1c6f4e 100644 --- a/app/sass/lib/_mixins.sass +++ b/app/sass/lib/_mixins.sass @@ -8,11 +8,15 @@ -moz-box-shadow: 0px 10px 13px -7px rgba(0,0,0,0.18) box-shadow: 0px 10px 13px -7px rgba(0,0,0,0.18) -//CAMBIAR ESTE AZUL POR LA VARIABLE DE AZUL / TRANSPARENTE @mixin drop-shadow-blue -webkit-box-shadow: 0px 8px 12px -11px rgba(91, 115, 255, 0.525) - // -moz-box-shadow: 0px 4px 4px -2px rgba(91, 115, 255, 0.525) - // box-shadow: 0px 4px 4px -2px rgba(91, 115, 255, 0.525) + -moz-box-shadow: 0px 8px 12px -11px rgba(91, 115, 255, 0.525) + box-shadow: 0px 8px 12px -11px rgba(91, 115, 255, 0.525) + +@mixin drop-shadow-blue-spread + -webkit-box-shadow: 0px 4px 12px -6px rgba(91, 115, 255, 0.525) + -moz-box-shadow: 0px 4px 12px -6px rgba(91, 115, 255, 0.525) + box-shadow: 0px 4px 12px -6px rgba(91, 115, 255, 0.525) @mixin drop-shadow-intermediate box-shadow: 0px 4px 4px 0px rgba(29, 29, 27, 0.15) @@ -67,7 +71,7 @@ //margin: 0 0 0 1.4rem .logotype .logoheader - width: 9rem + width: 7rem .menu_icon padding: 0 display: flex @@ -131,7 +135,7 @@ .logotype display: flex width: auto - font-size: 2.7rem + font-weight: $bold font-family: $montserrat-alternates color: $blue_primary @@ -157,15 +161,14 @@ display: flex flex-flow: row nowrap justify-content: space-between - font-size: 1.2rem + //font-size: 1.2rem gap: 2rem @mixin nav_bar_one_line .imagotype .logoheader - width: 9rem - .logotype - font-size: 1.7rem + width: 7rem + .menu width: auto font-weight: $semi-bold @@ -176,15 +179,14 @@ display: flex flex-flow: wrap row justify-content: space-between - font-size: 1.2rem + @mixin nav_bar_one_line_xl padding: 1.5rem 2.5rem 1.5rem 2.5rem .imagotype .logotype - font-size: 2.4rem .logoheader - width:11rem + width:9.4rem .isotype @mixin li_nav_bar @@ -195,10 +197,10 @@ text-decoration: none &.li-selected a - color: $link_header - border-bottom: $border1 $link_header + color: $link_header + border-bottom: $border1 $link_header &:hover - border-bottom: $border1 $link_header + border-bottom: $border1 $link_header //ES @@ -260,7 +262,7 @@ #banner-publications // background-image: url("/assets/img/headers/publications-banner-phone.svg") .parallax__layer - padding-top: 74px + padding-top: 60px @media (min-width:$min-tablet-width-es) .banner padding-top: 112px @@ -304,7 +306,7 @@ #banner-publications //background-image: url("/assets/img/headers/publications-banner-phone.svg") .parallax__layer - padding-top: 44px + padding-top: 54px @media (min-width:$min-tablet-width-en) .banner padding-top: 112px diff --git a/app/sass/lib/_structure.sass b/app/sass/lib/_structure.sass index 40607ba..efbcc5d 100644 --- a/app/sass/lib/_structure.sass +++ b/app/sass/lib/_structure.sass @@ -1,4 +1,10 @@ +//MARGINS + .standard_margin - @apply my-4 mx-4 sm:my-4 sm:mx-8 md:my-8 md:mx-14 lg:my-12 lg:mx-36 xl:mx-44 2xl:mx-60 + @apply m-4 sm:my-4 sm:mx-8 md:my-8 md:mx-14 lg:my-12 lg:mx-36 xl:mx-44 2xl:mx-60 .xl_margin - @apply my-8 mx-8 sm:my-12 sm:mx-16 md:my-16 md:mx-24 lg:my-20 lg:mx-44 xl:mx-60 2xl:mx-80 \ No newline at end of file + @apply m-8 sm:my-12 sm:mx-16 md:my-16 md:mx-24 lg:my-20 lg:mx-44 xl:mx-60 2xl:mx-80 + +//PADDINGS +.padding_card_highlight + @apply pt-8 pb-12 px-6 sm:p-8 md:pb-12 lg:pb-16 lg:pt-12 \ No newline at end of file diff --git a/app/sass/lib/_type.sass b/app/sass/lib/_type.sass index 3cde701..1917c7f 100644 --- a/app/sass/lib/_type.sass +++ b/app/sass/lib/_type.sass @@ -13,22 +13,20 @@ // 5to atributo: alto de linea // 6to atributo: margen bajo -$icon: 14px,14px, 16px,400 -$xs-text: 14px, 13px, 16px, 400, 140%, 1rem, 0.6rem //small -$body-text: 14px, 16px, 18px, 300, 140%, 1rem, 0.6rem -$button: 14px, 16px, 18px, 300 //buttons -$sm-text: 16px, 18px, 20px, 400, 140%, 1rem, 0.6rem //h5 -$md-text: 18px, 20px, 22px, 400, 140%, 1rem //h4 -$lg-text: 22px, 26px, 30px, 400,140%, 1rem //h3 -$xl-text: 23px, 30px, 36px, 300, 140%, 1rem //h2 -$xxl-text: 28px, 36px, 42px, 600, 140%, 1rem //h1 +$icon: 14px,14px, 18px,400 +$xs-text: 14px, 13px, 18px, 400, 140%, 1rem, 0.6rem //small +$body-text: 14px, 16px, 20px, 300, 140%, 1rem, 0.6rem +$button: 14px, 16px, 20px, 300 //buttons +$sm-text: 16px, 18px, 22px, 400, 140%, 1rem, 0.6rem //h5 +$md-text: 18px, 20px, 24px, 400, 140%, 1rem //h4 +$lg-text: 22px, 26px, 32px, 400,140%, 1rem //h3 +$xl-text: 23px, 30px, 38px, 300, 140%, 1rem //h2 +$xxl-text: 28px, 36px, 44px, 600, 140%, 1rem //h1 $slim-weight: 500 -$regular:400 -$semibold:600 -$bold:800 - - +$regular: 400 +$semibold: 600 +$bold: 800 h1 @media screen and (min-width: 150px) @@ -124,30 +122,28 @@ h5 line-height: nth($sm-text,5) margin-bottom: nth($sm-text,6) - - // parrafos, etiquetas e inputs p, label, input, select @media screen and (min-width: 150px) - font-family:$main_font, sans-serif + font-family: $main_font, sans-serif font-size: nth($body-text,1) line-height: nth($body-text,5) font-weight: nth($body-text,4) - @apply text-gray-100 + // @apply text-ffdBlue-400 //margin-bottom: nth($body-text,6) @media screen and (min-width: 640px) font-family: $main_font, sans-serif font-size: nth($body-text,2) line-height: nth($body-text,5) font-weight: nth($body-text,4) - @apply text-gray-100 + // @apply text-ffdBlue-400 //margin-bottom: nth($body-text,6) @media screen and (min-width: 1400px) font-family: $main_font, sans-serif font-size: nth($body-text,3) line-height: nth($body-text,5) font-weight: nth($body-text,4) - @apply text-gray-100 + // @apply text-ffdBlue-400 //margin-bottom: nth($body-text,6) // texto pequeño @@ -221,4 +217,4 @@ button, a @media screen and (min-width: 640px) font-size: nth($icon, 2) @media screen and (min-width: 1400px) - font-size: nth($icon,3) \ No newline at end of file + font-size: nth($icon,3) diff --git a/app/sass/lib/_variables.sass b/app/sass/lib/_variables.sass index 80bdece..8f549eb 100644 --- a/app/sass/lib/_variables.sass +++ b/app/sass/lib/_variables.sass @@ -57,17 +57,25 @@ $gray-100: #F8F8F8 //MEDIA QUERIES +//GENERIC +//ES +$min-phone-width: 150px +$max-phone-width: 640px +$min-tablet-width: 641px +$inter-tablet-width: 750px +$min-desktop-width: 970px +$min-xl-desktop-width: 1400px //ES $min-phone-width-es: 150px -$max-phone-width-es: 600px -$min-tablet-width-es: 601px +$max-phone-width-es: 640px +$min-tablet-width-es: 641px $inter-tablet-width-es: 750px $min-desktop-width-es: 970px $min-xl-desktop-width-es: 1400px //EN $min-phone-width-en: 150px -$max-phone-width-en: 600px -$min-tablet-width-en: 601px +$max-phone-width-en: 640px +$min-tablet-width-en: 641px $inter-tablet-width-en: 650px $min-desktop-width-en: 860px $min-xl-desktop-width-en: 1400px diff --git a/app/sass/main.scss b/app/sass/main.scss index e347484..947899e 100644 --- a/app/sass/main.scss +++ b/app/sass/main.scss @@ -13,12 +13,14 @@ @import "components/_buttons.sass"; @import "components/_tags.sass"; @import "components/_inputs.sass"; +@import "components/_icons.sass"; // partials @import "partials/_courses.sass"; @import "partials/_headermenu.sass"; @import "partials/_contact.sass"; @import "partials/_projects.sass"; +@import "partials/_project.sass"; @import "partials/_publications.sass"; @import "partials/_team.sass"; @import "partials/_tools.sass"; @@ -113,10 +115,7 @@ li { body, html { - color: black; - @apply text-gray-100; - font-size: 12px; - font-family: $montserrat; + @apply text-ffdBlue-300; // margin: 0 auto; scroll-behavior: smooth; } diff --git a/app/sass/partials/_footer.sass b/app/sass/partials/_footer.sass index c88f6ec..a65b49f 100644 --- a/app/sass/partials/_footer.sass +++ b/app/sass/partials/_footer.sass @@ -7,7 +7,7 @@ flex-direction: column //display: grid //grid-template-columns: 1fr 1fr - @apply bg-secondary + @apply bg-backgroundSecondary @apply text-white .container_line_1 display: flex diff --git a/app/sass/partials/_home.sass b/app/sass/partials/_home.sass index c9b0cf7..ea50c22 100644 --- a/app/sass/partials/_home.sass +++ b/app/sass/partials/_home.sass @@ -10,7 +10,7 @@ display: flex justify-content: space-between height: 50vh - margin-top: 6rem + margin-top: 3rem h3 @apply text-ca_blue-700 margin-bottom: 2rem @@ -122,16 +122,16 @@ .head display: flex justify-content: space-between - height: 60vh - margin-top: 8rem + height: 80vh + margin-top: 6rem .project_description p width:80% .group_description width: 100vw .logo_home - height: 4rem - width: auto + height: auto + width: 12rem img width: auto height: 25rem @@ -153,13 +153,15 @@ display: flex justify-content: space-between height: 100vh + margin-top: 0rem .project_description p width:80% .group_description .logo_home - height: 4rem + height: auto + width: 16rem img height: 35rem @@ -169,6 +171,7 @@ width:60% .group_description .logo_home - height: 5rem + height: auto + width: 24rem img height: 50rem \ No newline at end of file diff --git a/app/sass/partials/_project.sass b/app/sass/partials/_project.sass new file mode 100644 index 0000000..12954f6 --- /dev/null +++ b/app/sass/partials/_project.sass @@ -0,0 +1,17 @@ +@import "../lib/_variables.sass" +@import "../lib/_mixins.sass" + + +.card_goals + display: flex + flex-direction: column + + align-items: center + border-radius: 0.4rem + @include drop-shadow-blue-spread + h3 + @apply text-ffdGreen-400 + @media (min-width: $min-phone-width) + gap: 1rem + @media (min-width: $min-desktop-width) + gap: 2rem \ No newline at end of file diff --git a/app/sass/partials/_publications.sass b/app/sass/partials/_publications.sass index 6572060..3bb9dd9 100644 --- a/app/sass/partials/_publications.sass +++ b/app/sass/partials/_publications.sass @@ -35,10 +35,10 @@ margin-left: 0.4rem width: 2rem - section - gap: $spacing_md - display: flex - flex-direction: column + section + gap: $spacing_md + display: flex + flex-direction: column .load_more padding-top: $spacing_sm padding-bottom: 0 diff --git a/constants/langs/en.js b/constants/langs/en.js index 7a98513..3ca62c4 100644 --- a/constants/langs/en.js +++ b/constants/langs/en.js @@ -37,7 +37,10 @@ export const en = { "GoalTitle": "A nivel de sistemas", "GoalBody": "Innovaciones en nodos de red programables, offloading de funcionalidades y procesamiento distribuido.", } - + }, + "Impact": { + "sectionTitle": "Impact", + "sectionBody": "Contribución a la generación de conocimiento: Cómo el proyecto ayudará a avanzar en las áreas de redes y sistemas de computación. Relevancia estratégica: Alineación con estrategias nacionales y europeas como España Digital 2026 y Horizon Europe.", } }, "publications": { diff --git a/constants/langs/es.js b/constants/langs/es.js index 0cb38e7..41d3c1b 100644 --- a/constants/langs/es.js +++ b/constants/langs/es.js @@ -34,8 +34,11 @@ export const es = { "Goal2": { "GoalTitle": "A nivel de sistemas", "GoalBody": "Innovaciones en nodos de red programables, offloading de funcionalidades y procesamiento distribuido.", + }, + "Impact": { + "sectionTitle": "Impact", + "sectionBody": "Contribución a la generación de conocimiento: Cómo el proyecto ayudará a avanzar en las áreas de redes y sistemas de computación. Relevancia estratégica: Alineación con estrategias nacionales y europeas como España Digital 2026 y Horizon Europe.", } - } }, "publications": { diff --git a/tailwind.config.js b/tailwind.config.js index 0fc6f32..951ed88 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -13,19 +13,31 @@ module.exports = { "conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))", }, colors: { - primary: "#5441FF", - secondary: "#393D49", - link_header: "#9ECBFF", + bluePrimary:'#1C74D9', + greenPrimary:'#98CE00', + backgroundPrimary: "#272932", + backgroundSecondary: "#393D49", + linkHeader: "#9ECBFF", accent: "#5340FF", - black: "#272932", + black: "#1F2023", white: "#FAFBFF", burgundy: "#9F226D", cyan: "#21E2ED", lilac: "#AE9FF2", - bluePrimary:'#1C74D9', - greenPrimary:'#98CE00', + //borrar ca_blue, ca_orange cuando ya no estén usándose en ningún componente //borrar + ffdGreen:{ + 400:'#D7F38A', + 300: '#F1FFCA', + }, + ffdBlue:{ + 500:'#3D8EEA', + 400: '#9ECBFF', + 300: '#C9E2FF', + 200: '#E8F2FF', + 100: '#F9FCFF' + }, ca_blue: { 900: "#3302BF", 800: "#4507C9", @@ -54,19 +66,25 @@ module.exports = { 100:'#F8F8F8', }, - ffdGreen:{ - 400:'#D7F38A', - 300: '#F1FFCA', - }, - ffdBlue:{ - 500:'#3D8EEA', - 400: '#9ECBFF', - 300: '#C9E2FF', - 200: '#E8F2FF', - 100: '#F9FCFF' - }, + }, }, + screens: { + 'sm': '640px', + // => @media (min-width: 640px) { ... } + + 'md': '768px', + // => @media (min-width: 768px) { ... } + + 'lg': '1024px', + // => @media (min-width: 1024px) { ... } + + 'xl': '1280px', + // => @media (min-width: 1280px) { ... } + + '2xl': '1536px', + // => @media (min-width: 1536px) { ... } + } }, plugins: [], corePlugins: {