-
Notifications
You must be signed in to change notification settings - Fork 13
Examen #1
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
igflub
wants to merge
6
commits into
cifo-training:master
Choose a base branch
from
igflub: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
Examen #1
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
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 |
|---|---|---|
| @@ -1,58 +1,76 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset=utf-8"/> | ||
| <title>EXERCICI HTML-CSS</title> | ||
| <!-- <link rel="stylesheet" href="css/style.css"> --> | ||
|
|
||
|
|
||
| <meta charset="utf-8"/> | ||
| <title>EXERCICI HTML-CSS</title> | ||
| <link rel="stylesheet" href="style.css"> | ||
| </head> | ||
|
|
||
|
|
||
| <body> | ||
|
|
||
| <!-- Cabecera --> | ||
| <!-- Título con hipertexto al propio contenido del web--> | ||
| Mi sitio web | ||
| <!-- Menú de navegación --> | ||
|
|
||
| Inicio | ||
| Blog | ||
| Sobre mi | ||
| Fotos | ||
| Portfolio | ||
| Contacto | ||
| Enlaces | ||
|
|
||
| <!-- Contenido Principal --> | ||
| <!-- 1. ---fotografia koala.png con pie de foto:"descripción de la foto" de 200*200 px--> | ||
| <!-- 2. Texto --> | ||
| <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ornare sapien ac nibh vulputate feugiat. Morbi euismod velit sit amet libero volutpat ultrices in quis sem. Sed sit amet placerat sem. Curabitur vitae lectus nec purus accumsan faucibus. Donec vitae volutpat tortor. Suspendisse tempor rutrum urna, in consequat est tincidunt vitae. Cras et ligula at felis placerat tempor. Fusce elementum metus non justo luctus iaculis.</p> | ||
| <p>Donec ligula arcu, sagittis lacinia nibh et, consequat gravida turpis. Aenean nec scelerisque felis. Integer nec odio sed lorem mattis rhoncus quis quis nibh. Praesent non fringilla nisi. Duis porta placerat mattis. Aenean in mollis odio, at egestas massa. Quisque in lectus magna. Vestibulum vel faucibus massa, vel varius tortor. Maecenas et laoreet neque, ut semper neque. Suspendisse aliquet, nisl vel pharetra ultricies, elit felis molestie sem, ac scelerisque turpis tortor non lacus.</p> | ||
| <!-- Contenido relacionado--> | ||
| <!-- Tres apartados con lista desordenada de enlaces: | ||
| 1. Categorías | ||
| <div class="cuerpo"> | ||
| <header> | ||
| <div class="titulo"> | ||
| <a href="../" class="misitio"><h1>Mi sitio web</h1></a> | ||
| </div> | ||
| <nav> | ||
| <ul> | ||
| <li><a href="#" title="Enlace genérico">Inicio</a></li> | ||
| <li><a href="#" title="Enlace genérico">Blog</a></li> | ||
| <li><a href="#" title="Enlace genérico">Sobre mi</a></li> | ||
| <li><a href="#" title="Enlace genérico">Fotos</a></li> | ||
| <li><a href="#" title="Enlace genérico">Portfolio</a></li> | ||
| <li><a href="#" title="Enlace genérico">Contacto</a></li> | ||
| <li><a href="#" title="Enlace genérico">Enlaces</a></li> | ||
| </ul> | ||
| </nav> | ||
| </header> | ||
| <br> | ||
| <main> | ||
| <article> | ||
| <figure> | ||
| <img src="koala.jpg" alt="Koala" > | ||
| <figcaption>Descripción de la foto</figcaption> | ||
| </figure> | ||
|
|
||
| Categoría 1 | ||
| Categoría 2 | ||
| Cateogría 3 | ||
| Categoría 4 | ||
| Categoría 5 | ||
|
|
||
| 2. Archivo | ||
| Marzo 2019 | ||
| Febrero 2019 | ||
| Enero 2019 | ||
| Diciembre 2018 | ||
| <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ornare sapien ac nibh vulputate feugiat. Morbi euismod velit sit amet libero volutpat ultrices in quis sem. Sed sit amet placerat sem. Curabitur vitae lectus nec purus accumsan faucibus. Donec vitae volutpat tortor. Suspendisse tempor rutrum urna, in consequat est tincidunt vitae. Cras et ligula at felis placerat tempor. Fusce elementum metus non justo luctus iaculis.</p> | ||
| <p>Donec ligula arcu, sagittis lacinia nibh et, consequat gravida turpis. Aenean nec scelerisque felis. Integer nec odio sed lorem mattis rhoncus quis quis nibh. Praesent non fringilla nisi. Duis porta placerat mattis. Aenean in mollis odio, at egestas massa. Quisque in lectus magna. Vestibulum vel faucibus massa, vel varius tortor. Maecenas et laoreet neque, ut semper neque. Suspendisse aliquet, nisl vel pharetra ultricies, elit felis molestie sem, ac scelerisque turpis tortor non lacus.</p> | ||
| </article> | ||
|
|
||
| </main> | ||
| <aside> | ||
| <h2>Categorias</h2> | ||
| <br> | ||
| <ul> | ||
| <li><a href="#" title="Enlace genérico">Categoria 1</a></li> | ||
| <li><a href="#" title="Enlace genérico">Categoria 2</a></li> | ||
| <li><a href="#" title="Enlace genérico">Categoria 3</a></li> | ||
| <li><a href="#" title="Enlace genérico">Categoria 4</a></li> | ||
| <li><a href="#" title="Enlace genérico">Categoria 5</a></li> | ||
| </ul> | ||
| <br> | ||
| <h2>Archivo</h2> | ||
| <br> | ||
| <ul> | ||
| <li><a href="#" title="Enlace genérico">Marzo 2019</a></li> | ||
| <li><a href="#" title="Enlace genérico">Febrero 2019</a></li> | ||
| <li><a href="#" title="Enlace genérico">Diciembre 2019i</a></li> | ||
| <li><a href="#" title="Enlace genérico">Enero 2019</a></li> | ||
| </ul> | ||
| <br> | ||
| <h2>Enlaces</h2> | ||
| <br> | ||
| <ul> | ||
| <li><a href="#" title="Enlace genérico">Enlace 1</a></li> | ||
| <li><a href="#" title="Enlace genérico">Enlace 2</a></li> | ||
| <li><a href="#" title="Enlace genérico">Enlace 3</a></li> | ||
| <li><a href="#" title="Enlace genérico">Enlace 4</a></li> | ||
| <li><a href="#" title="Enlace genérico">Enlace 5</a></li> | ||
|
|
||
| 3. Enlaces | ||
| Enlace 1 | ||
| Enlace 2 | ||
| ... | ||
| Enlace 5 | ||
| </ul> | ||
|
|
||
| <!-- Pie de pagina --> | ||
| © 2019 Vuestro nombre y apellidos | ||
| </aside> | ||
| <footer> | ||
| <p>© 2019 Ignasi Flaquer</p> | ||
| </footer> | ||
| </div> | ||
| </body> | ||
| </html> | ||
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
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.
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.
No son necesarios los saltos de línea. Estamos estructurando. Los espacios los daremos con CSS.