-
Notifications
You must be signed in to change notification settings - Fork 34
[Mariana Ruddy] desafio 1 #15
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
Open
marianaruddy
wants to merge
50
commits into
WoMakersCode:master
Choose a base branch
from
marianaruddy:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
50 commits
Select commit
Hold shift + click to select a range
5a1249d
primeiro commit
marianaruddy 2e814ee
hello world
marianaruddy 9301a52
header da pagina
marianaruddy 3ed80ae
continuando secao de bem vinda
marianaruddy 235cb7f
secao de servicos
marianaruddy ae083b3
secoes 'meus trabalhos' e 'quem sou eu'
marianaruddy 12b582f
secao 'contato'
marianaruddy 8325510
detalhes da pagina que faltaram
marianaruddy 26261ac
agrupando classes melhor
marianaruddy 5b359ae
tracando tag div por tag footer
marianaruddy e251d67
adicinando aquivo todo
marianaruddy ec88617
todo done
marianaruddy f8a5e7c
refc: trocando algumas divs por section e nav
marianaruddy a76dfbe
criando arquivo css e linkando com arquivo html
marianaruddy fd221d7
criando arquivo css
marianaruddy e326042
refac: add class na imagem
marianaruddy 00d63de
add css na branch desafio2
marianaruddy 8fa7059
bug: cosnertando tags sem fechar e typo
marianaruddy 357b0e3
bug: consertanto algumas classes
marianaruddy 6248fe2
bug: consertando nome de classes
marianaruddy 76ad72d
ajustando tamahos de wraps
marianaruddy ea6bd05
mudando cor de titulo
marianaruddy 97e4476
ajustando tamanho de texto
marianaruddy 8336bf1
setando tamanho de h1 e h2
marianaruddy 30291f2
css basico da secao de contato
marianaruddy 0f29d9d
alinhamento
marianaruddy 873a574
adicionando cor de texto amarela
marianaruddy c2d306e
colocando cor nos titulos
marianaruddy 48810aa
envolvendo os dados em uma div
marianaruddy 6d09b68
colocando imagem no background welcome
marianaruddy 1faa7fa
comecando habilidades
marianaruddy f396222
fazendo backgroud ficar rosa
marianaruddy 94cfa87
ajeitando padding nos subtitles
marianaruddy 97a432a
css na secao meus trabalhos
marianaruddy 8e5d4a4
teste
marianaruddy 3c98d2e
desfazendo teste
marianaruddy d81a317
css no meus trabalhos
marianaruddy 8f945fd
tirando max-witdh no body
marianaruddy 004b91c
comecando a fazer porcentagem de habilidades
marianaruddy 73f20f4
refac: organizando css
marianaruddy 5b40369
feat: fazendo habilidades
marianaruddy 1ea4113
feat: adicionando fontawsome e melhorando organizacao do html
marianaruddy 9998c18
grupo de estudos: ajustando margens, paddings,...
marianaruddy 9199b9c
ajeitando css, colocando hover...
marianaruddy 23e10de
fix: resolvendo o probelma do hover andando
marianaruddy 51bf980
fix: tirando comando inutil
marianaruddy 7921ff3
fix: ajeitando icones e margens
marianaruddy 57f5901
fix: ajeitando widths
marianaruddy e32f72e
refac: removendo comentarios
marianaruddy 9811c28
Merge pull request #2 from marianaruddy/desafio2
marianaruddy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,179 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="pt-br"> | ||
|
|
||
| <head> | ||
| <meta charset="utf-8" /> | ||
| <link rel="stylesheet" type="text/css" href="style.css" /> | ||
| <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" crossorigin="anonymous"> | ||
| <title>WoMakersCode</title> | ||
| </head> | ||
|
|
||
| <body> | ||
| <section class="body-wrapper"> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @marianaruddy essa section onde ela fecha? |
||
| <header class="page-header"> | ||
| <a href=""><img class="logo-header" src="../images/logo.png" alt="logo" /></a> | ||
| <nav class="menu-itens"> | ||
| <a class="menu-item" href=""><span>Home</span></a> | ||
| <a class="menu-item" href=""><span>Serviços</span></a> | ||
| <a class="menu-item" href=""><span>Sobre mim</span></a> | ||
| <a class="menu-item" href=""><span>Meus trabalhos</span></a> | ||
| <a class="menu-item" href=""><span>Contato</span></a> | ||
| </nav> | ||
| </header> | ||
| <div class="transition"></div> | ||
| <section class="welcome-wrapper"> | ||
| <div class="carousel"> | ||
| <div class="carousel-welcome"> | ||
| <div class="left-welcome"> | ||
| <h1 class="welcome-title">Bem vind@</h1> | ||
| <h2 class="welcome-subtitle">Nam ac fermentum</h2> | ||
| <span class="text white">Lorem ipsum dolor sit amet, consectetur adipiscing elit. | ||
| Phasellus vitae ullamcorper est. Vestibulum congue dolor et | ||
| ullamcorper feugiat. Nam</span> | ||
| </div> | ||
| <div class="right-welcome"> | ||
| <img src="../images/slider01.png" alt="logo" class="logo"/> | ||
| </div> | ||
| </div> | ||
| <div class="carousel-hide1" style="display: none"> | ||
| segunda pagina do carrossel | ||
| </div> | ||
| <div class="carousel-hide2" style="display: none"> | ||
| terceira pagina do carrossel | ||
| </div> | ||
| </div> | ||
| </section> | ||
| <section class="content-wrapper services-wrapper"> | ||
| <h1 class="section-title pink">Serviços</h1> | ||
| <span class="subtitle text orange">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus | ||
| vitae ullamcorper est.</span> | ||
| <div class="services"> | ||
| <div class="service"> | ||
| <img class="service-img" src="../images/Service1.png" alt="website" /> | ||
| <h2 class="service-title orange">Website</h2> | ||
| <span class="text white">In aliquet vitae dui vitae efficitur. Donec non convallis enim. | ||
| </span> | ||
| </div> | ||
| <div class="service"> | ||
| <img class="service-img" src="../images/Service2.png" alt="templates" /> | ||
| <h2 class="service-title orange">Templates</h2> | ||
| <span class="text white">Aenean posuere magna vitae libero malesuada, dictum congue. | ||
| </span> | ||
| </div> | ||
| <div class="service"> | ||
| <img class="service-img" src="../images/Service3.png" alt="temas-wordpress" /> | ||
| <h2 class="service-title orange">Temas Wordpress</h2> | ||
| <span class="text white">In hac habitasse platea dictumst. Morbi nunc neque, vestibulum | ||
| utlaoreet in. | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </section> | ||
| <div class="transition"></div> | ||
| <section class="content-wrapper my-works-wrapper"> | ||
| <h1 class="section-title pink">Meus Trabalhos</h1> | ||
| <span class="subtitle text black">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus | ||
| vitae ullamcorper est.</span> | ||
| <nav class="works-menu"> | ||
| <a href=""></a><span class="works-menu-item"> Tudo </span></a> | ||
| <a href=""></a><span class="works-menu-item"> Website </span></a> | ||
| <a href=""></a><span class="works-menu-item"> Templates </span></a> | ||
| <a href=""></a><span class="works-menu-item"> Tema </span></a> | ||
| </nav> | ||
| <div class="works-thumbnail"> | ||
| <div class="thumbnail"> | ||
| <img class="thumbnail-photo" src="../images/Portfolio01.png" alt="" /> | ||
| <div class="thumbnail-description"> | ||
| <div class="thumbnail-title yellow">Thumbnail label</div> | ||
| <div class="thumbnail-text white">Thumbnail caption...</div> | ||
| </div> | ||
| </div> | ||
| <div class="thumbnail"> | ||
| <img class="thumbnail-photo" src="../images/Portfolio02.png" alt="" /> | ||
| <div class="thumbnail-description"> | ||
| <div class="thumbnail-title yellow">Thumbnail label</div> | ||
| <div class="thumbnail-text white">Thumbnail caption...</div> | ||
| </div> | ||
| </div> | ||
| <div class="thumbnail"> | ||
| <img class="thumbnail-photo" src="../images/Portfolio03.png" alt="" /> | ||
| <div class="thumbnail-description"> | ||
| <div class="thumbnail-title yellow">Thumbnail label</div> | ||
| <div class="thumbnail-text white">Thumbnail caption...</div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </section> | ||
| <div class="transition"></div> | ||
| <section class="content-wrapper who-am-i-wrapper"> | ||
| <h1 class="section-title pink">Quem sou eu</h1> | ||
| <span class="subtitle text orange">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus | ||
| vitae ullamcorper est.</span> | ||
| <img src="../images/photo.png" alt="foto mulher" /> | ||
| <span class="photo-subtitle orange">Joana D'arc</span> | ||
| <div class="social-media yellow"> | ||
| <div class=" circle-icon black"> | ||
| <i class="fab fa-facebook-f"></i> | ||
| </div> | ||
| <div class=" circle-icon black"> | ||
| <i class="fab fa-linkedin-in"></i> | ||
| </div> | ||
| <div class=" circle-icon black"> | ||
| <i class="fab fa-twitter"></i> | ||
| </div> | ||
| </div> | ||
| <span class="about-me-text"></span> | ||
| <h2 class="about-me-title orange">Sobre mim</h2> | ||
| <div class="text white"> | ||
| Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus | ||
| vitae ullamcorper est. Vestibulum congue dolor et ullamcorper feugiat. | ||
| In hac habitasse platea dictumst. Morbi nunc neque, vestibulum ut | ||
| laoreet in, imperdiet rhoncus justo. Nam vel ipsum ut odio rhoncus | ||
| molestie. Aenean posuere magna vitae libero malesuada, dictum interdum | ||
| augue congue. Proin convallis convallis arcu a tempor. | ||
| </div> | ||
| <div class="habilities-wrapper"> | ||
| <h2 class="skills orange">Habilidades</h2> | ||
| <div class="skill"> | ||
| <div class="empty"></div><span class="white"></span> | ||
| <div class="fill js"><span class="white">JavaScript</span></div> | ||
| </div> | ||
| <div class="skill"> | ||
| <div class="empty"></div> | ||
| <div class="fill htmlcss"><span class="white">Hmtl & Css</span></div> | ||
| </div> | ||
| <div class="skill"> | ||
| <div class="empty"></div> | ||
| <div class="fill jquery"><span class="white">jQuery</span></div> | ||
| </div> | ||
| <div class="skill"> | ||
| <div class="empty"></div> | ||
| <div class="fill wordpress"><span class="white">Wordpress</span></div> | ||
| </div> | ||
|
|
||
| </div> | ||
| </section> | ||
| <section class="content-wrapper contact-wrapper"> | ||
| <h1 class="section-title pink">Contato</h1> | ||
| <span class="subtitle text black">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus | ||
| vitae ullamcorper est.</span> | ||
| <div class="contact-data"> | ||
| <span class="email">meuemail@mail.com</span> | ||
| <span class="telefone white">+55 21 997115009</span> | ||
| </div> | ||
| <h3 class="midia-title">Midias</h3> | ||
| <div class="social-media"> | ||
| <div class=" circle-icon orange"> | ||
| <i class="fab fa-facebook-f"></i> | ||
| </div> | ||
| <div class=" circle-icon orange"> | ||
| <i class="fab fa-linkedin-in"></i> | ||
| </div> | ||
| <div class=" circle-icon orange"> | ||
| <i class="fab fa-twitter"></i> | ||
| </div> | ||
| <i class="fab fa-pinterest"></i> | ||
| <i class="fab fa-google-plus"></i> | ||
| </div> | ||
| </section> | ||
| <footer><span class="white">Woman + Tech = < /strong> </span> </footer> </section> </body> </html> | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@marianaruddy a tag body não está sendo fechada lá embaixo... dê uma olhada depois