Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #12

Open
wants to merge 59 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
1d8edcb
Enrutamiento, controladores y vistas (home y register)
LaDuquesaDev Mar 18, 2022
9392862
Completar templates register y login, instalar firebase auth y pendie…
Angezul02 Mar 18, 2022
5c55d5a
Merge pull request #2 from Angezul02/ramaluz
LaDuquesaDev Mar 18, 2022
79cee29
Agregamos estilos css a hero y vamos en sign up y login faltan detall…
paolahuyo Mar 19, 2022
8db479b
Merge pull request #3 from paolahuyo/paola
LaDuquesaDev Mar 19, 2022
2b78af5
Terminamos estilo de vista login, register y hero en mobile first
LaDuquesaDev Mar 19, 2022
3c6fddd
Agregue el responsive para laptop de 1200px a 1600px
paolahuyo Mar 19, 2022
dcb667c
Se le dio orden al css del responsive
paolahuyo Mar 19, 2022
e7c0294
Merge pull request #4 from paolahuyo/responsive
LaDuquesaDev Mar 20, 2022
bde8073
funciona la pagina con firebase.js y main.js con las funciones de fir…
paolawalker Mar 20, 2022
d6cd11c
Se agrega nav bar, sin que se vea para movil y viendose para portatil…
paolawalker Mar 20, 2022
bfd9c43
Se corrigieron tamaños de fuentes para portatil
paolawalker Mar 20, 2022
b3f4448
organización del codigo de firebase en firebase.js, en main.js y se i…
paolawalker Mar 20, 2022
0be05ce
Se realizan pruebas para el registro con mail pero no estan funcionan…
paolawalker Mar 20, 2022
a9d4391
Eliminamos firebase.js, lo dividimos en funcionalidades. Agregamos un…
paolahuyo Mar 22, 2022
4315389
Merge pull request #5 from paolahuyo/firebase
LaDuquesaDev Mar 22, 2022
2bbd62f
funciona el evento de formRegister
paolahuyo Mar 22, 2022
b8a2892
Separamos las funcionalidades de firebase por archivos js en la carpe…
paolahuyo Mar 22, 2022
8557b8c
Merge pull request #6 from paolahuyo/firebase
LaDuquesaDev Mar 22, 2022
9fce0f3
cambios de colores en bar y textos
paolahuyo Mar 23, 2022
faf2471
Merge pull request #7 from paolahuyo/firebase
LaDuquesaDev Mar 23, 2022
03c6768
No hay problemas de inicializacion de firebase al abrir la pagina per…
paolahuyo Mar 23, 2022
6c97c97
Merge pull request #8 from paolahuyo/firebase
LaDuquesaDev Mar 23, 2022
b36b713
Se soluciona inconveniente relacionado a firebase y se agrega linea d…
LaDuquesaDev Mar 23, 2022
895e3da
algunos arreglos de identación y recibir cambios firebase
Angezul02 Mar 23, 2022
1dd1067
recibir cambios firebase
Angezul02 Mar 23, 2022
9db55d3
template de feed
Angezul02 Mar 24, 2022
d8a9634
Se generaron los mensajes de error en el registro de usuario, se edit…
Angezul02 Mar 24, 2022
f93cff1
Merge pull request #9 from Angezul02/ramaluz
LaDuquesaDev Mar 24, 2022
b00b468
Revisión de cambios para actualizar
LaDuquesaDev Mar 25, 2022
adc37fe
Implementamos grid css en vista register y hero y resolvimos error PO…
LaDuquesaDev Mar 25, 2022
317e327
funciona responsive para register, hay que hacer adaptacion para desk…
paolahuyo Mar 26, 2022
54193fe
Se mejora el responsive y se agregan divs en el form de register
paolahuyo Mar 26, 2022
0404fd9
Se realizan pruebas de usabilidad en mobile y se hacen cambios en fue…
paolahuyo Mar 26, 2022
569da0b
finalizacion de trabajo de css para hero y register-viernes 25 de Marzo
paolahuyo Mar 26, 2022
883458e
Terminamos el css de hu1 para mobile
paolahuyo Mar 28, 2022
c1a3463
Merge pull request #10 from paolahuyo/responsive
LaDuquesaDev Mar 28, 2022
54f8bd5
Se deja listo el css para register y login
paolahuyo Mar 28, 2022
75db1bf
Merge pull request #11 from paolahuyo/responsive
LaDuquesaDev Mar 28, 2022
f51e746
Cambios en el archivo spec
LaDuquesaDev Mar 28, 2022
ad55772
Guardo cambios para subir a testing
paolahuyo Mar 29, 2022
398dcf4
Se arregla class btn icon en register
paolahuyo Mar 29, 2022
d1098bf
Se crea media query para oantallas de mas de 1000px
paolahuyo Mar 29, 2022
ae8f186
Merge pull request #12 from paolahuyo/responsive
LaDuquesaDev Mar 29, 2022
150eef0
Actualizo cambios para recibir modificaciones en media query desktop …
LaDuquesaDev Mar 29, 2022
fbe2a79
Merge branch 'yuli' of https://github.com/yuliduquedealba/BOG004-soci…
LaDuquesaDev Mar 29, 2022
14f2840
implementación de mediaQuery para vista de escritorio
Angezul02 Mar 29, 2022
d10fe41
Merge pull request #13 from Angezul02/ramaluz
LaDuquesaDev Mar 29, 2022
5b9cfe1
Merge branch 'yuli' of https://github.com/yuliduquedealba/BOG004-soci…
LaDuquesaDev Mar 29, 2022
8e9a71e
Algunos cambios extra
paolahuyo Mar 29, 2022
d2b5337
Merge pull request #14 from paolahuyo/responsive
LaDuquesaDev Mar 30, 2022
3932383
Merge branch 'yuli' of https://github.com/yuliduquedealba/BOG004-soci…
LaDuquesaDev Mar 30, 2022
2e014b9
Creo rama para testear
LaDuquesaDev Mar 30, 2022
237f746
Sebas resuelve el error porfiiiin
LaDuquesaDev Mar 30, 2022
d3cf5fd
actualizo cambios para hacer pull de origin yuli
LaDuquesaDev Mar 30, 2022
7e90917
Merge pull request #15 from yuliduquedealba/testing
LaDuquesaDev Mar 30, 2022
340f0a1
Merge pull request #16 from yuliduquedealba/testing
LaDuquesaDev Mar 30, 2022
d40eae7
Primera función testeada
LaDuquesaDev Mar 31, 2022
e0d70f5
Se realiza test para cuando el usuario no logra registrarse correctam…
LaDuquesaDev Mar 31, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Se agrega nav bar, sin que se vea para movil y viendose para portatil…
…, falta agregar las acciones a los botones
paolawalker committed Mar 20, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit d6cd11c3ce56821e0219bfa956855de4fed55948
10 changes: 10 additions & 0 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
<!DOCTYPE html>
<html lang="en">

<nav class="nav">
<div class="nav-title"><img class="nav-logo" src="\images\logo-ninja-signup-responsive.svg"></div>
<div class="nav-ittems">
<button class="nav-btn-border">INICIAR SESIÓN</button>
<button class="nav-btn-bg">REGISTRARSE</button>
<button class="nav-btn">FEED</button>
<button class="nav-btn">PERFIL</button>
</div>
</nav>

<head>
<title>Ninja Red Social de Tics</title>
<link href="style.css" rel="stylesheet" type="text/css">
48 changes: 48 additions & 0 deletions src/style.css
Original file line number Diff line number Diff line change
@@ -4,6 +4,9 @@
}
/*Responsive Mobile*/
@media screen and (max-width: 740px) {
nav{
display: none;
}
body{
margin: 0;
}
@@ -108,6 +111,51 @@
and (min-device-width: 1200px)
and (max-device-width: 1600px)
and (-webkit-min-device-pixel-ratio: 1) {
.nav {
position: sticky;
display: flex;
justify-content: space-between;
align-items: center;
height: 70px;
top: 0;
background: #034174;
}
.nav-title {
margin: 0px 30px;
}
.nav-logo{
height: 50px;
}
.nav-btn {
display: inline-block;
height: 40px;
margin: 0px 4px;
padding: 10px;
}
.nav-btn-border {
display: inline-block;
height: 40px;
margin: 0px 4px;
padding: 10px;
color: #04033B;
border: solid;
font-weight: 600;
border-width: 2px;
border-radius: 6px;
border-color: #04033B;
background-color: #fff;
}
.nav-btn-bg {
display: inline-block;
height: 40px;
margin: 0px 4px;
padding: 10px;
font-weight: 600;
color: #fff;
background-color: #04033B;
border: none;
border-radius: 6px;
}
p {
margin-left: 0;
font-size: 18px;