Skip to content

Commit 44b141a

Browse files
clara7227clara7227
committed
ajustes en carga de tipografía
1 parent 26e6cd7 commit 44b141a

File tree

7 files changed

+41
-32
lines changed

7 files changed

+41
-32
lines changed

‎app/about/page.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ export default function About(props) {
104104
</svg>
105105
</span>
106106
<p>
107-
E.T.S. DE INGENIEROS DE TELECOMUNICACIÓN <br/>
108-
Av. Complutense, 30 <br/>
109-
28040 Madrid Edificio B
107+
{t("contact.direction1")} <br/>
108+
{t("contact.direction2")} <br/>
109+
{t("contact.direction3")} <br/>
110110
</p>
111111
</h5>
112112
</li>

‎app/layout.jsx

+7-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use client";
22

3-
import { Source_Sans_3, Inter } from "next/font/google";
3+
import { Source_Sans_3, Ubuntu } from "next/font/google";
44
import "./globals.css";
55
import { useState, useEffect } from "react";
66
import Head from 'next/head';
@@ -12,8 +12,8 @@ import Header from "@/components/core/Header";
1212
import Footer from "@/components/core/Footer";
1313

1414

15-
const sourceSans = Source_Sans_3({ subsets: ["latin"] });
16-
const inter = Inter({ subsets: ["latin"], weight: ["400", "700"] });
15+
const sourceSans = Source_Sans_3({ subsets: ["latin"] , variable: "--font-sourceSans" });
16+
const ubuntu = Ubuntu({ subsets: ["latin"], weight: ["400", "700"] , variable: "--font-ubuntu" });
1717

1818
export default function RootLayout({ children }) {
1919
//disable SSR whole project, this will make the project to be rendered only on client side
@@ -24,26 +24,20 @@ export default function RootLayout({ children }) {
2424
}, []);
2525

2626
return (
27-
<html hola="bye">
27+
<html className={` ${sourceSans.variable} ${ubuntu.variable} `}>
2828
<Head>
2929
<link rel="icon" href="/icon.ico" />
3030
</Head>
31-
<body >
31+
<body>
32+
{/* <body className={`${ubuntu.className} ${sourceSans.className} `}> */}
3233
<Header/>
3334
{isClient ? (
3435
<>
35-
<h1 className={inter.className}></h1>
36-
<h2 className={inter.className}></h2>
37-
<h3 className={inter.className}></h3>
38-
<h4 className={inter.className}></h4>
39-
<h5 className={inter.className}></h5>
40-
<h6 className={inter.className}></h6>
41-
<p className={sourceSans.className}></p>
4236
{children}
4337
</>
4438
) : null}
4539
<Footer />
46-
</body>
40+
</body>
4741
</html>
4842
);
4943
}

‎app/utils/fonts.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { Source_Sans_3, Ubuntu } from "next/font/google";
2+
3+
export const sourceSans_init = Source_Sans_3({ subsets: ["latin"] });
4+
export const ubuntu_init = Ubuntu({ subsets: ["latin"], weight: ["400", "700"] });
5+
6+
export const sourceSans = sourceSans_init.variable;
7+
export const ubuntu = ubuntu_init.variable;

‎constants/langs/en.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,12 @@ export const en = {
120120
"title2": "Any questions? Contact us. ",
121121
"title3": "Where are we?",
122122
"listTitle2":"Phone",
123-
"body": "Do you want to get in touch with us for any consultation or colaborations ( course, project or publication) ? In the CyberAula group we are open to work together with other groups or educational institutions, as well as the participation in european or national projects as long as they are related to our main lines of action. Ask and we'll be glad to establish contact for possible colaborations.",
123+
"body": "If you want more information about our project or would like to join the Eunomia community to participate in our activities, you can send an email or call the addresses listed below.",
124+
"direction1": "E.T.S. DE INGENIEROS DE TELECOMUNICACIÓN",
125+
"direction2": "Av. Complutense, 30",
126+
"direction3": "28040 Madrid Building B"
127+
128+
124129
},
125130
"footer": {
126131
"title1":"Sections",

‎constants/langs/es.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,10 @@ export const es = {
124124
"listTitle":"E-mail",
125125
"listTitle2":"Teléfono",
126126

127-
"body": "¿Deseas ponerte en contacto con nosotros para cualquier colaboración o consulta (curso, proyecto o publicación)?. En el grupo CyberAula estamos abiertos a colaborar con grupos e instituciones educativas, y a la participación en proyectos europeos y nacionales, siempre y cuando estén relacionados con nuestras principales líneas de actuación. Pregúntanos y estaremos encantados de contactar para posibles colaboraciones. ",
128-
127+
"body": "Si quieres más información sobre nuestro proyecto o te gustaría unirte a la comunidad Eunomia para participar en nuestras actividades, puedes enviar un correo electónico o llamar a las direcciones que te incluimos a continuación. ",
128+
"direction1": "E.T.S. DE INGENIEROS DE TELECOMUNICACIÓN",
129+
"direction2": "Av. Complutense, 30",
130+
"direction3": "28040 Madrid Edificio B"
129131
},
130132
"footer": {
131133
"title1":"Secciones",

‎package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tailwind.config.js

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/** @type {import('tailwindcss').Config} */
22

33
const plugin = require('tailwindcss/plugin');
4+
45
module.exports = {
56
content: [
67
"./pages/**/*.{js,ts,jsx,tsx,mdx,css,scss,sass}",
@@ -12,8 +13,8 @@ module.exports = {
1213
theme: {
1314
extend: {
1415
fontFamily: {
15-
'inter': ['inter'],
16-
'source-sans': ['"Source Sans 3","__Source_Sans_3_32aa65", "__Source_Sans_3_Fallback_32"'],
16+
"ubuntu": ['var(--font-ubuntu)', 'sans-serif'],
17+
"sourceSans": ['var(--font-sourceSans)', 'sans-serif'],
1718
},
1819
fontSize: {
1920
// 'xs': ['0.75rem', { lineHeight: '1.4' }],
@@ -89,15 +90,15 @@ module.exports = {
8990
plugins: [
9091
plugin(function({ addBase, theme }) {
9192
addBase({
92-
'h1': { fontFamily: theme('fontFamily.inter') },
93-
'h2': { fontFamily: theme('fontFamily.inter') },
94-
'h3': { fontFamily: theme('fontFamily.inter') },
95-
'h4': { fontFamily: theme('fontFamily.inter') },
96-
'h5': { fontFamily: theme('fontFamily.inter') },
97-
'h6': { fontFamily: theme('fontFamily.inter') },
98-
'p': { fontFamily: theme('fontFamily.source-sans') },
99-
'a': { fontFamily: theme('fontFamily.source-sans') },
100-
'button': { fontFamily: theme('fontFamily.source-sans') },
93+
'h1': { fontFamily: theme('fontFamily.ubuntu') },
94+
'h2': { fontFamily: theme('fontFamily.ubuntu') },
95+
'h3': { fontFamily: theme('fontFamily.ubuntu') },
96+
'h4': { fontFamily: theme('fontFamily.ubuntu') },
97+
'h5': { fontFamily: theme('fontFamily.ubuntu') },
98+
'h6': { fontFamily: theme('fontFamily.ubuntu') },
99+
'p': { fontFamily: theme('fontFamily.sourceSans') },
100+
'a': { fontFamily: theme('fontFamily.sourceSans') },
101+
'button': { fontFamily: theme('fontFamily.sourceSans') },
101102
})
102103
})
103104
],

0 commit comments

Comments
 (0)