Skip to content

Commit

Permalink
new version with small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ebarra committed Mar 21, 2024
1 parent d338743 commit ff2f7f4
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 24 deletions.
4 changes: 4 additions & 0 deletions app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@tailwind components;
@tailwind utilities;


:root {
--foreground-rgb: 0, 0, 0;
--background-start-rgb: 214, 219, 220;
Expand All @@ -18,16 +19,19 @@

body {
color: rgb(var(--foreground-rgb));
/*
background: linear-gradient(
to bottom,
transparent,
rgb(var(--background-end-rgb))
)
rgb(var(--background-start-rgb));
*/
}

@layer utilities {
.text-balance {
text-wrap: balance;
}
}

2 changes: 1 addition & 1 deletion app/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { Inter } from "next/font/google";
import './main.scss';
import 'bootstrap/dist/css/bootstrap.min.css';
//import 'bootstrap/dist/css/bootstrap.min.css';
import "./globals.css";


Expand Down
4 changes: 4 additions & 0 deletions app/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1580,3 +1580,7 @@ body :not(.menu) a {
text-decoration: none;
}
}

.logoheader {
height: 50px;
}
30 changes: 11 additions & 19 deletions app/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import { useEffect, useState } from "react";
import Header from "@/components/Header";
import Footer from "@/components/Footer";
import Carousel from 'react-bootstrap/Carousel';
import RecentPublications from "@/components/RecentPublications";
import {mycarousel} from "@/constants/carousel.js";

Expand All @@ -28,7 +27,7 @@ export default function Home() {
<section className="home">
<div className="head">
<div className="group_logo">
<img alt="logo" className="logo" src="/assets/img/group-logo.png"/>
<img alt="logo" className="logo" src="/assets/img/group-logo.svg"/>
</div>
<div className="group_description">
<h1>CYBERAULA GROUP</h1>
Expand All @@ -40,23 +39,16 @@ export default function Home() {
</div>
</div>
<div className="body">
<div className="carousel">
<Carousel>
{carousel.map(({label, description, image, url})=>{
return (
<Carousel.Item key={label}>
<a href={url} target="_blank" rel="noopener noreferrer">
<img className="image" src={image} alt={label}/>
<Carousel.Caption>
<h3>{label}</h3>
<p>{description}</p>
</Carousel.Caption>
</a>
</Carousel.Item>
);
})
}
</Carousel>
<div className="carousel">
/* Carousel removed to remove bootstrap - see ging page to see how it was */
<a href="https://www.etsit.upm.es/otros-elementos/noticias.html?tx_news_pi1%5Bnews%5D=696&tx_news_pi1%5Bcontroller%5D=News&tx_news_pi1%5Baction%5D=detail&cHash=4c592d8df53070d3e17090b296443b76" target="_blank" rel="noopener noreferrer">
<img className="image" src="/assets/img/carousel/cyberaula.png" alt="Cyberaula"/>
<div class="carousel-caption">
<h3>Cyberaula</h3>
<p>Awarded by the UPM as the best group of Educational Innovation of 2018</p>
</div>
</a>

</div>
<div className="latest_publications">
<h3>Latest publications</h3>
Expand Down
5 changes: 2 additions & 3 deletions components/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ export default function Header (props) {
<header className="nav_bar" id="header_home">
<a href="/">
<div className="imagotype">
<div className="isotype">
</div>
<img class="logoheader" src="/assets/img/group-logo-only.png" alt="logo"/>
<div className="logotype">
GING
CYBERAULA
</div>
</div>
</a>
Expand Down
4 changes: 3 additions & 1 deletion next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ const nextConfig = {
images: {
unoptimized: true,
},

env: {
PUBLIC_URL: "https://cyberaula.github.io"
}
};

export default nextConfig;
Binary file added public/assets/img/group-logo-only.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/group-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions public/assets/img/group-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ module.exports = {
},
},
plugins: [],
corePlugins: {
preflight: false,
},
};

0 comments on commit ff2f7f4

Please sign in to comment.