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

PR de correção #13

Open
wants to merge 31 commits into
base: correcao-projeto
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
05de1f7
added briefing and image
jvpalves Feb 21, 2020
9cdcb7b
landing page
cazuzabarberino Feb 21, 2020
c3b8613
pagina equipe CSS html e arquivos
Meira-JH Feb 21, 2020
336331d
Merge pull request #2 from future4code/semana2-projeto
skempfer Feb 21, 2020
5e08de9
cores corrigidas
cazuzabarberino Feb 21, 2020
ff9831f
Merge pull request #3 from future4code/cazuza-branch
cazuzabarberino Feb 21, 2020
84c9714
nav feita
cazuzabarberino Feb 21, 2020
1f5fa69
Merge pull request #4 from future4code/cazuza-branch
cazuzabarberino Feb 21, 2020
ebb49e0
equipe finalizada para entre de sexta
Meira-JH Feb 21, 2020
b253d33
Merge pull request #5 from future4code/semana2-projeto
Meira-JH Feb 21, 2020
2cf1c84
index com texto
Meira-JH Feb 21, 2020
fc05d73
Merge branch 'master' into semana2-projeto
Meira-JH Feb 21, 2020
3eac42e
Merge pull request #6 from future4code/semana2-projeto
Meira-JH Feb 21, 2020
0f0bfd5
entrega incompleta
cazuzabarberino Feb 21, 2020
e9649ca
algumas correções
cazuzabarberino Feb 22, 2020
81d11c5
Merge pull request #7 from future4code/cazuza-branch
cazuzabarberino Feb 22, 2020
d70835a
pagina principal atualizada. imagens e formatação acrescentados
Meira-JH Feb 22, 2020
a45ee9b
Merge pull request #8 from future4code/semana2-projeto
Meira-JH Feb 22, 2020
701fb6a
butões do nav funcionando
cazuzabarberino Feb 22, 2020
678e01e
Faq e Quem somos, prontos para avaliação da equipe.
skempfer Feb 22, 2020
ad40ba7
pagina equipe finalizada
Meira-JH Feb 22, 2020
8b6f2dd
tentando organizar
Meira-JH Feb 22, 2020
5a3b600
esboço final pagina equipe. pronto para correcoes finais
Meira-JH Feb 22, 2020
d26afa4
Merge pull request #11 from future4code/semana2-projeto
skempfer Feb 22, 2020
1d9ef70
Correções Feitas
cazuzabarberino Feb 22, 2020
6652dc9
Merge pull request #10 from future4code/hamilton-4safe-ana
cazuzabarberino Feb 22, 2020
581c5bc
pagina equipe padronizada. Versão final para revisão
Meira-JH Feb 22, 2020
bed105c
Merge pull request #12 from future4code/semana2-projeto
skempfer Feb 23, 2020
df2cc04
inclusão de acessibilidade as páginas
skempfer Feb 23, 2020
0c66061
Alteração na ordem da página Quem somos
skempfer Feb 23, 2020
08116d3
adicionado aos CSS o @media screen and()
skempfer Feb 23, 2020
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
373 changes: 373 additions & 0 deletions 4safe/equipe.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,373 @@
*{
margin: 0px;
padding: 0px;
box-sizing: border-box;
font-family: sans-serif;
outline: 0;
}


html, body{
height: 100%;
}

body {
width: 100%;
height: 100%;
font-size: 16px;
color: black;
display: flex;
flex-direction: column;
}

/* HEADER STYLE */

header{
display: flex;
justify-content: space-between;
align-items: center;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 7vw;
background-color:white;
border-bottom: 1px solid black;
outline: 1px;
outline-style: groove;
outline-color: rgba(0, 0, 0, .3);
}

nav{
height: 100%;
}

header a{
height: 90%;
margin-left: 10px;
}

header img{
height: 100%;
padding: 5px;
background-color: #3b4f66;
border-radius: 20px;
}

/* NAV STYLE */

nav{
display: flex;
align-items: center;

height: 100%;
}

nav ul{
list-style: none;
display: flex;
align-items: center;
height: 100%;
}

nav li{
/* border-right: 2px solid #698f69; */
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Se lembre(m) de remover código comentado (código morto)

border-right: 2px solid #96ce6d;
padding: 10px 0;
padding-right: 10px;
}

nav li a{
text-decoration: none;
font-size: 20px;
transition: background-color .5s;

color: #698f69;
}

.subscribe-button{
background-color: #3b4f66;
width: 250px;
height: 7vw;
transition: background-color .5s;
transition-timing-function: ease-out;
color: #96ce6d;
font-weight: bold;
font-size: 20px;
display: flex;
justify-content: center;
align-items: center;
text-align: center;
border: none;
}

.subscribe-button:hover{
background-color: #5b6c80;
}


/* FORMS STYLE */

#forms{
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;

position: fixed;
right: -500px;
height: 100%;
width: 400px;
background-color: #b8bfc7;
border-left: 2px solid grey;
transition: right .25s;
transition-timing-function: ease-out;
}

#forms form{
display: flex;
flex-direction: column;
justify-content: space-evenly;
/* border: 1px solid red; */
width: 80%;
height: 500px;
}

#forms form div{
display: flex;
justify-content: space-between;
align-items: center;
}

#forms label{
color: #3b4f66;
font-weight: bold;
font-size: 22px;
}

#forms input{
width: 250px;
border: none;
background-color: rgba(0, 0, 0, 0);
color: #3b4f66;
font-size: 20px;
border-bottom: 2px solid grey;
}

#forms select{
width: 100px;
border: none;
background-color: rgba(0, 0, 0, 0);
color: #3b4f66;
font-size: 20px;
cursor: pointer;
}

#check-box-div input{
width: 50px;
}

#check-box-div label{
font-size: 18px;
}

#forms p{
color: #3b4f66;
font-weight: bold;
font-size: 40px;
text-align: left;
width: 80%;
}

#forms form button{
background-color: #3b4f66;
border: none;
color: #b8bfc7;
width: 200px;
height: 50px;
font-size: 25px;
font-weight: bold;
align-self: center;
cursor: pointer;
transition: background-color .5s;
}

#forms form button:hover{
background-color: #5b6c80;
}

#close-form-button{
position: absolute;
right: 20px;
top: 20px;
color: #3b4f66;
background-color: #5b6c80;;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aqui temos um ;;. Isso pode encrencar na hora de renderizar o estilo.

font-size: 40px;
width: 60px;
height: 60px;
border: none;
border-radius: 100px;
cursor: pointer;
}

#black-overlay{
display: none;
position: fixed;
background-color: rgba(0, 0, 0, .5);
width: 100%;
height: 100%;
border: none;
}

/* MAIN */

main{
flex: 1;
flex-direction: column;
margin-top: 5vw;
}

main>section:first-child {
display: flex;
flex-direction: column;
justify-content: space-evenly;
align-items: center;
height: 34vw;
background-color: #3b4f66;
width: 100%;
}

main>section:first-child>img{
width: 34vw;
}

main>section:nth-child(2){
height: 25vw;
display: flex;
flex-direction: column;
align-items: center;
padding-bottom: 3vw;
background-color: #b8bfc7;
}

main>section:nth-child(2)> div{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
color: black;
font-size: 2vw;
text-align: center;
font-weight: bold;
width: 50%;
height: 90%;
}



/* PIPOU */


section:nth-of-type(3){
width: 100%;
height: 100VW;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
background-color: white;
border-radius: 1vw;

}

section:nth-of-type(3)>div{
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 90%;
height: 80%;
background-color: #3b4f66;
border-radius: 2vw;

}


.pessoas{
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cuidado com a mistura de inglês com português na nomeação de seletores.

display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
padding: 2vw 0;
}

.pessoas div{
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
width: 23%;
border: #96ce6d 2px solid;
text-align: center;
height: 100%;
border-bottom-left-radius: 1vw;
border-top-left-radius: 1vw;
border-right: none;
color: #96ce6d;
padding-left: 2vw;
font-weight: 700;
background-color: #95ce6d2c;
}


.pessoas img{
width: 23%;
border: #96ce6d 2px solid;
border-left: none;
border-bottom-right-radius: 1vw;
border-top-right-radius: 1vw;
height: 100%;
}



footer{
display: flex;
justify-content: flex-end;
flex: none;
background-color: #3b4f66;
height: 60px;
width: 100%;
}

.socials{
display: flex;
align-items: center;
height: 100%;
margin-right: 20px;
}

.socials a{
margin-left: 20px;
display: block;
height: 40px;
background-color: #b8bfc7;
border-radius: 10px;
padding: 1px;
transition: background-color .5s;
}

.socials a:hover{
background-color: #698f69;
}

.socials img{
height: 100%;
}

/*responsividade Iphone 6/7/8 375px*/

@media screen and (max-width: 375px){


}
Loading