PR de Correção - #15

Open

amandarangel wants to merge 76 commits into

correcao-projetofrom

Commits on Apr 15, 2021

criei os html e o arquivo .css
vitorszk
committed
1b9f676
Update compra-comida.html
IELSK
authored
ab04105
Update compra-mercado.html
IELSK
authored
9f2017b
Update contato.html
IELSK
authored
c755d7e
Update index.html
IELSK
authored
715e322
Merge pull request #1 from future4code/vitorSuzuki-header
IELSK
authored
47c762e
Fonte alterada para Lato
vitorszk
committed
10c8f6d
Merge branch 'master' into vitorSuzuki-header
vitorszk
authored
0d4069e
Merge pull request #2 from future4code/vitorSuzuki-header
vitorszk
authored
aa3fb5a
header praticamente finalizado
vitorszk
committed
ec49b9c
alterei pagina mercado.html e criei pasta img
BrunoSilva28
committed
ae76c49
página principal e imagens adicionadas
IELSK
committed
2aac8ca
Merge branch 'master' into PedroBarbosa-home
IELSK
authored
82ceb32
página inicial finalizada
IELSK
committed
bd5d55f
atualizacao menor feita
IELSK
committed
015100e
página principal finalizada
IELSK
committed
bac6080
pagina inicial finalizada
IELSK
committed
4c64045
mudanças menores
IELSK
committed
bca974a
f
IELSK
committed
294130f
resolução de conflitos
IELSK
committed
b572907
modifiquei o header
vitorszk
committed
25d73dd

Commits on Apr 16, 2021

Merge branch 'vitorSuzuki-header' into vitorSuzuki-newHeader
vitorszk
committed
6c20cd3
alterei fundo e botoes, e parte do responsive
BrunoSilva28
committed
7275b49
ajuste minimo no css
BrunoSilva28
committed
988917b
alterei pagina comidas, com responsive quase completo
BrunoSilva28
committed
677002b
Merge pull request #3 from future4code/brunoSilva-paginaMercado
vitorszk
authored
327fa2d
Merge branch 'master' into PedroBarbosa-home
vitorszk
authored
371ab37
Merge pull request #6 from future4code/PedroBarbosa-home
vitorszk
authored
df46f94
finalizacao responsividade
IELSK
committed
8f382dc
finalização responsividade
IELSK
committed
12a4ba4
Merge branch 'master' of https://github.com/future4code/paiva-landing-page8 into PedroBarbosa-home
IELSK
committed
3fcb427
correção menor
IELSK
committed
72e3a74
Todos os conflitos foram resolvidos
vitorszk
committed
845eb64
opacidade do header
vitorszk
committed
4ed00f4
pagina contato finalizada e devidamente responsiva
IELSK
committed
692477c
Merge branch 'master' into PedroBarbosa-home
IELSK
authored
e7be84c
Merge branch 'master' into brunoSilva-paginaComidas
BrunoSilva28
authored
89d6223
conflito resolvido
IELSK
committed
be5a75e
Merge pull request #8 from future4code/brunoSilva-paginaComidas
BrunoSilva28
authored
95bd6ee
alteração pequena
IELSK
committed
8d745bb
alteração pequena
IELSK
committed
ade1408
mais alterações pequenas
IELSK
committed
26dbe26
Merge branch 'master' into PedroBarbosa-home
IELSK
authored
5790062
ultimas alteraçoes
IELSK
committed
85fe86f
footer pronto e responsivo, header também
vitorszk
committed
8ca0515
resolução conflito
IELSK
committed
3b441cd
Merge pull request #9 from future4code/PedroBarbosa-home
IELSK
authored
ba05db8
Merge branch 'master' into vitorSuzuki-newHeader
IELSK
authored
f46fc0b
Merge pull request #10 from future4code/vitorSuzuki-newHeader
IELSK
authored
422e58f
atualização contato
IELSK
committed
58e6f7b
n
IELSK
committed
0301492
n
IELSK
committed
392599b
Merge pull request #11 from future4code/PedroBarbosa-home
IELSK
authored
e214e69
footer corrigido
vitorszk
committed
08db8f7
Update README.md
IELSK
authored
0376c31
Update README.md
IELSK
authored
48bedf7
footer e header finalizados
vitorszk
committed
4bf8a79
Update README.md
IELSK
authored
a03ba0a
n
IELSK
committed
c8261a8
Merge branch 'master' of https://github.com/future4code/paiva-landing-page8 into PedroBarbosa-home
IELSK
committed
ff3ee61
teste
IELSK
committed
70f73c1
Merge pull request #12 from future4code/PedroBarbosa-home
IELSK
authored
70549cd
header e footer todos finalizados
vitorszk
committed
682a26f
ajustes no responsive
BrunoSilva28
committed
b97c87d
ajustes finais responsive
BrunoSilva28
committed
059f981
Merge pull request #13 from future4code/brunoSilva-paginaMercado
BrunoSilva28
authored
0033949
ajuste final de erro
BrunoSilva28
committed
d004a21
ajuste final erros
BrunoSilva28
committed
a92c381
Merge pull request #14 from future4code/brunoSilva-paginaMercado
BrunoSilva28
authored
70076cc
Update README.md
IELSK
authored
91f8d52
Update README.md
IELSK
authored
368275a
Update README.md
IELSK
authored
a0ead8c
Update README.md
IELSK
authored
b36a1c0
botão home finalizado
vitorszk
committed
ac1756a
Merge branch 'master' of https://github.com/future4code/paiva-landing-page8
vitorszk
committed
de869fc
Update README.md
IELSK
authored
f0f8c19