Skip to content

Commit

Permalink
First review (#17)
Browse files Browse the repository at this point in the history
* create develop branch

* not found upload

* Base del proyecto

* not found upload with style

* not found upload with style

* a

* first commit

* commit

* Proyecto base

* Proyecto base

* re-organize scaffolding

* Update readme

Primera version del readme

* 404 cargado con diseño, y sincronizado con el proyecto

* 404 cargado con diseño, y sincronizado con el proyecto

* HTML del creador de reunion

* add heading nav

* nuevo diseño converor

* create page crear reunion

* Trabajando en la pestaña Crear Reunión

* funcionalidad del selector destino

* nuevo diseño conversor

* seccion de resultados

* pagina crear reunion v1.0 terminada

* Fixeo de link en la navegacion de crear reunion

* conversor de hora actualizado.

* fix navbar

* Agregar página 404 de Faustino

* not found page full responsive

* add new style to conversor page

---------

Co-authored-by: julianalvarez243 <[email protected]>
Co-authored-by: dev-santi <[email protected]>
Co-authored-by: Johel Goñi <[email protected]>
  • Loading branch information
4 people authored Feb 25, 2024
1 parent 5891c1e commit eaf005c
Show file tree
Hide file tree
Showing 33 changed files with 16,008 additions and 1 deletion.
Binary file added .DS_Store
Binary file not shown.
37 changes: 37 additions & 0 deletions 404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>404 not found</title>
<link rel="stylesheet" href="./css/index.css">
<link rel="stylesheet" href="css/style404.css">
</head>
<body>
<header class="header">
<a href="#">
<img class="logo" src="./assets/img/logo.png" alt="logo"></img>
</a>
<h1>Fundación InkuA</h1>
<nav>
<a href="./pages/crear-reunion.html">
Crear reunion
</a>
</nav>
</header>


<main class="main">
<div class="contentError">
<p><img class="imgNF" src="./assets/img/NotFound2.png" alt="404 image"></p>
<p class="error404"><span>&#9888;</span> 404 </p>
<p class="noEncontrada">Pagina no Encontrada</p>
<p class="messageError">La página que estás buscando no existe o ha sido removida. Sigue explorando nuestro sitio</p>
<a href="./index.html" class="regresoButton"> Regresar a inicio</a>

</div>

</main>

</body>
</html>
Binary file added assets/.DS_Store
Binary file not shown.
Binary file added assets/fonts/Rubik-VariableFont_wght.ttf
Binary file not shown.
Binary file added assets/img/NotFound2.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 added assets/img/copy.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 added assets/img/cross.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 added assets/img/logo.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 added assets/img/plus-circle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 58 additions & 0 deletions conversor/404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<link rel="stylesheet" href="./css/index.css">
<link rel="stylesheet" href="css/style404.css">
</head>
<body>
<header>
<nav>
<a href="./index.html">
<img class="logo" src="./assets/img/logo.png" alt="logo"></img>
</a>

<a href="./pages/crear-reunion.html"><h1 class="nav-first-title">Crear Reunión</h1></a>
<a href="./index.html">
<span class="nav-second-title">conversor</span>
</a>

</nav>
</header>

<div class="main">

<div class="logoMain">
<svg id="Capa_1" data-name="Capa 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 561.17"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#034c8c;}</style></defs><path class="cls-1" d="M864.25,0H0V425.41A135.76,135.76,0,0,0,135.75,561.17H1000V135.75A135.75,135.75,0,0,0,864.25,0Z"/><path class="cls-2" d="M135.08,197.16a25,25,0,1,1-24.82-24.82A24.68,24.68,0,0,1,135.08,197.16ZM131,387.44H87.33V240.67H131Z"/><path class="cls-2" d="M206.84,263.35c12.25-14.14,26.08-23.56,47.13-23.56,26.7,0,41.15,15.39,47.44,28.27,5.34,10.68,5.65,21.05,5.65,33.93v85.45H261.19V305.76c0-9.11,0-15.39-2.2-20.74-3.14-8.79-11.31-13.5-20.42-13.5-18.22,0-29.84,19.47-31.73,22.62v93.3H161.29V242.61h45.55Z"/><path class="cls-2" d="M385.91,314.24l57.17-71.63h53.1l-56.55,71.63,59.06,73.2H443.08l-57.17-71.31v71.31H340V195h45.87Z"/><path class="cls-2" d="M656.08,387.44H610.21V366.71c-15.71,22.3-36.76,23.56-45.87,23.56-29.22,0-44.3-18.22-49.64-32-3.14-8.79-3.14-17.27-3.14-25.13V242.61h45.87V319.9c0,17.59,0,38.64,22,38.64,5.66,0,18.54-1.57,30.79-20.42V242.61h45.87Z"/><path class="cls-2" d="M913.68,387.44H856.19L838.6,345H742.78l-16,42.41H670.21L756.6,176.23h61.89ZM788.33,224.71l-31.42,82.93h66Z"/></svg>
</div>

<div class="mainTitle">
<h1>404 Error</h1>
</div>

<div class="descriptionError">
<p>Si el error continua, contacte al personal de <a target="_blank" href="#">sistemas</a></p>
</div>

</div>

<footer>
<div class="footer">
<ul>
<li>
<a href="index.html">Volver al inicio</a>
</li>

<li>
<a target="_blank" href="#">Ayuda</a>
</li>
<li>
<a target="_blank" href="https://inkua.de">InkuA</a>
</li>
</ul>
</div>
</footer>
</body>
</html>
Binary file not shown.
Binary file added conversor/assets/img/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
93 changes: 93 additions & 0 deletions conversor/css/index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
@font-face {
font-family: "rubik";
src: url("../assets/fonts/Rubik-VariableFont_wght.ttf");
font-weight: 300 400 500 600 700;
}

:root {
/* Colores */
--clr-negro: #070417;
--clr-gris-oscuro: #555555;
--clr-gris-claro: #d9d9d9;
--clr-blanco: #fafaff;

--clr-celeste: #74acdf;
--clr-azul: #0038a8;
--clr-rojo: #ff6d90;

--clr-uno: #E6E2DB;
--clr-dos: #FBF9F1;
--clr-tres: #ABD8DA;
--clr-cuatro: #93C8D0;

/* Tamaños para textos */
--txt-2xl: 3.25rem; /* 52px */
--txt-xl: 2rem; /* 32px */
--txt-lg: 1.75rem; /* 28px */
--txt-md: 1.375rem; /* 22px */
--txt-base: 1.125rem; /* 18px */
--txt-sm: 0.875rem; /* 14px */

/* Pesos de fuentes */
--wgh-bold: 700;
--wgh-semiBold: 600;
--wgh-medium: 500;
--wgh-regular: 400;
--wgh-ligth: 300;
}

* {
padding: 0;
margin: 0;
box-sizing: border-box;
}

html {
font-family: rubik;
background-color: var(--clr-cuatro);
color: var(--clr-negro);
}


body{
max-width: 1280px;
margin: 0 auto;
}

/* header style start */
nav{
display: flex;
justify-content: space-between;
align-items: center;
margin: 10px 20px;
}
.logo{
aspect-ratio: 1/1;
width: 60px;
}
.nav-first-title{
font-size: 1rem;
}
.nav-second-title{
font-size: 0.7rem;
font-weight: 300;
}


@media (min-width: 601px) {


nav{
margin: 20px 40px;
}
.nav-first-title{
font-size: 1.6rem;
}
.nav-second-title{
font-size: 1rem;
font-weight: 300;
}

}
/* header style finish */

123 changes: 123 additions & 0 deletions conversor/css/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@

:root {
/* Colores */
--clr-negro: #070417;
--clr-gris-oscuro: #555555;
--clr-gris-claro: #d9d9d9;
--clr-blanco: #fafaff;

--clr-celeste: #74acdf;
--clr-azul: #0038a8;
--clr-rojo: #ff6d90;

--clr-uno: #E6E2DB;
--clr-dos: #FBF9F1;
--clr-tres: #ABD8DA;
--clr-cuatro: #93C8D0;

/* Tamaños para textos */
--txt-2xl: 3.25rem; /* 52px */
--txt-xl: 2rem; /* 32px */
--txt-lg: 1.75rem; /* 28px */
--txt-md: 1.375rem; /* 22px */
--txt-base: 1.125rem; /* 18px */
--txt-sm: 0.875rem; /* 14px */

/* Pesos de fuentes */
--wgh-bold: 700;
--wgh-semiBold: 600;
--wgh-medium: 500;
--wgh-regular: 400;
--wgh-ligth: 300;
}


.main {
width: 90%;
margin: 0 auto;
text-align: center;
}


.formularioCiudad {
margin: 0 auto;
width: 400px;
text-align: right;
}

.formularioCiudad input {
margin-left: 50px;
margin-bottom: 70px;
border: 0px;
border-radius: 5px;
width: 200px;
height: 20px;
}


.formularioCiudad input[type="datetime-local"] {
text-align: center;
}

footer {
color: var(--clr-azul); /* Puedes personalizar el color del texto según tus necesidades */
padding: 10px;
text-align: center;
position: fixed;
width: 100%;
bottom: 0;

}

a {
color: inherit;
text-decoration: none;
}

h1 {
font-weight: var(--wgh-bold);
font-size: var(--txt-lg);
}

h2 {
font-weight: var(--wgh-medium);
font-size: var(--txt-md);
}

/* Media querys */
@media (min-width: 45rem) {
h1 {
font-size: var(--txt-2xl);
}

h2 {
font-size: var(--txt-xl);
}
}

/* Hasta aca el style del index.html */

/* Aca comienza el css de crear-reunion.html */

.formularioReunion {
display: flex;
margin: 0 auto;
font-weight: var(--wgh-bold);
width: 40%;
}

.informacionReunion {
width: 50%;
}

.informacionReunion input, .informacionReunion textarea{
margin-bottom: 20px;
}

.datosReunion {
width: 50%;
}
.formularioReunion input[type="text"], .formularioReunion textarea {
width: 200px;
}

Loading

0 comments on commit eaf005c

Please sign in to comment.