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.

Sign up for GitHub

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

MERGE1: Merge de las correcciones paginas 3 y 5 #95

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

MERGE1: Merge de las correcciones paginas 3 y 5 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b5b01ee
FIX1: Corrección de páginas 3 y 5
satiricum Nov 8, 2024
df25262
Update #titulo1, #imagen1, #enlace1, #enlace1, of file html/pagina1.…
Nov 8, 2024
4fddb4a
Update #titulo2, #imagen2, #enlace2, #enlace2, of file html/pagina2.…
Nov 8, 2024
bcb7f97
Update #titulo3, #imagen3, #enlace3, #enlace3, of file html/pagina3.…
Nov 8, 2024
f8c1efd
Update #titulo4, #imagen4, #enlace4, #enlace4, of file html/pagina4.…
Nov 8, 2024
62c9dee
Update #titulo5, #imagen5, #enlace5, #enlace5, of file html/pagina5.…
Nov 8, 2024
0b6542b
Merge automático
static-web-project[bot] Nov 8, 2024
170f146
MERGE1: Merge de las correcciones pag 3 y 5
satiricum Nov 8, 2024
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
44 changes: 21 additions & 23 deletions html/pagina1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=UTF-8">
<TITLE>Mi primera página</TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.0 (Win32)">
<META NAME="AUTHOR" CONTENT="Gloria Cort&eacute;s">
<META NAME="CREATED" CONTENT="20020903;6090096">
<META NAME="CHANGEDBY" CONTENT="Gloria Cort&eacute;s">
<META NAME="CHANGED" CONTENT="20020903;6133657">
<!DOCTYPE html><html><head>
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
<title>Mi primera página</title>
<meta name="GENERATOR" content="OpenOffice.org 1.0 (Win32)">
<meta name="AUTHOR" content="Gloria Cortés">
<meta name="CREATED" content="20020903;6090096">
<meta name="CHANGEDBY" content="Gloria Cortés">
<meta name="CHANGED" content="20020903;6133657">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
</HEAD>
<BODY LANG="es-ES" class="container text-center">
<H1>
<IMG ID="imagen1" SRC="../imagenes/BD1.gif" NAME="Imagen1" ALIGN=CENTER WIDTH=700 HEIGHT=50><BR CLEAR=LEFT><BR><BR>
</H1>
<H1 ID="titulo1">Mi primera página HTML</H1>
<P>
<BR><BR>
</P>
</head>
<body lang="es-ES" class="container text-center">
<h1>
<img id="imagen1" src="../imagenes/BD1.gif" name="Imagen1" align="CENTER" width="700" height="50"><br clear="LEFT"><br><br>
</h1>
<h1 id="titulo1">Mi primera página HTML</h1>
<p>
<br><br>
</p>
<div class="row text-center">
<div class="col-md-6">
<span>&larr;</span><A HREF="pagina5.html">Mi quinta página HTML</A>
<span>←</span><a href="pagina5.html">Mi quinta página HTML</a>
</div>
<div class="col-md-6">
<A ID="enlace1" HREF="pagina1.html">Mi primera página HTML</A><span>&rarr;</span>
<a id="enlace1" href="pagina2.html">Mi segunda página HTML</a><span>→</span>
</div>
</div>
</BODY>
</HTML>

</body></html>
44 changes: 21 additions & 23 deletions html/pagina2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=UTF-8">
<TITLE>Mi primera página</TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.0 (Win32)">
<META NAME="AUTHOR" CONTENT="Gloria Cort&eacute;s">
<META NAME="CREATED" CONTENT="20020903;6090096">
<META NAME="CHANGEDBY" CONTENT="Gloria Cort&eacute;s">
<META NAME="CHANGED" CONTENT="20020903;6133657">
<!DOCTYPE html><html><head>
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
<title>Mi primera página</title>
<meta name="GENERATOR" content="OpenOffice.org 1.0 (Win32)">
<meta name="AUTHOR" content="Gloria Cortés">
<meta name="CREATED" content="20020903;6090096">
<meta name="CHANGEDBY" content="Gloria Cortés">
<meta name="CHANGED" content="20020903;6133657">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
</HEAD>
<BODY LANG="es-ES" class="container text-center">
<H1>
<IMG ID="imagen2" SRC="../imagenes/BD1.gif" NAME="Imagen1" ALIGN=CENTER WIDTH=700 HEIGHT=50><BR CLEAR=LEFT><BR><BR>
</H1>
<H1 ID="titulo2">Mi primera página HTML</H1>
<P>
<BR><BR>
</P>
</head>
<body lang="es-ES" class="container text-center">
<h1>
<img id="imagen2" src="../imagenes/BD2.gif" name="Imagen1" align="CENTER" width="700" height="50"><br clear="LEFT"><br><br>
</h1>
<h1 id="titulo2">Mi segunda página HTML</h1>
<p>
<br><br>
</p>
<div class="row text-center">
<div class="col-md-6">
<span>&larr;</span><A HREF="pagina1.html">Mi primera página HTML</A>
<span>←</span><a href="pagina1.html">Mi primera página HTML</a>
</div>
<div class="col-md-6">
<A ID="enlace2" HREF="pagina2.html">Mi segunda página HTML</A><span>&rarr;</span>
<a id="enlace2" href="pagina3.html">Mi tercera página HTML</a><span>→</span>
</div>
</div>
</BODY>
</HTML>

</body></html>
44 changes: 21 additions & 23 deletions html/pagina3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=UTF-8">
<TITLE>Mi primera página</TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.0 (Win32)">
<META NAME="AUTHOR" CONTENT="Gloria Cort&eacute;s">
<META NAME="CREATED" CONTENT="20020903;6090096">
<META NAME="CHANGEDBY" CONTENT="Gloria Cort&eacute;s">
<META NAME="CHANGED" CONTENT="20020903;6133657">
<!DOCTYPE html><html><head>
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
<title>Mi primera página</title>
<meta name="GENERATOR" content="OpenOffice.org 1.0 (Win32)">
<meta name="AUTHOR" content="Gloria Cortés">
<meta name="CREATED" content="20020903;6090096">
<meta name="CHANGEDBY" content="Gloria Cortés">
<meta name="CHANGED" content="20020903;6133657">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
</HEAD>
<BODY LANG="es-ES" class="container text-center">
<H1>
<IMG ID="imagen3" SRC="../imagenes/BD1.gif" NAME="Imagen1" ALIGN=CENTER WIDTH=700 HEIGHT=50><BR CLEAR=LEFT><BR><BR>
</H1>
<H1 ID="titulo3">Mi primera página HTML</H1>
<P>
<BR><BR>
</P>
</head>
<body lang="es-ES" class="container text-center">
<h1>
<img id="imagen3" src="../imagenes/BD3.gif" name="Imagen1" align="CENTER" width="700" height="50"><br clear="LEFT"><br><br>
</h1>
<h1 id="titulo3">Mi tercera página HTML</h1>
<p>
<br><br>
</p>
<div class="row text-center">
<div class="col-md-6">
<span>&larr;</span><A HREF="pagina2.html">Mi segunda página HTML</A>
<span>←</span><a href="pagina2.html">Mi segunda página HTML</a>
</div>
<div class="col-md-6">
<A ID="enlace3" HREF="pagina2.html">Mi segunda página HTML</A><span>&rarr;</span>
<A ID="enlace3" HREF="pagina4.html">Mi cuarta página HTML</A><span>&rarr;</span>
</div>
</div>
</BODY>
</HTML>

</body></html>
44 changes: 21 additions & 23 deletions html/pagina4.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=UTF-8">
<TITLE>Mi primera página</TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.0 (Win32)">
<META NAME="AUTHOR" CONTENT="Gloria Cort&eacute;s">
<META NAME="CREATED" CONTENT="20020903;6090096">
<META NAME="CHANGEDBY" CONTENT="Gloria Cort&eacute;s">
<META NAME="CHANGED" CONTENT="20020903;6133657">
<!DOCTYPE html><html><head>
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
<title>Mi primera página</title>
<meta name="GENERATOR" content="OpenOffice.org 1.0 (Win32)">
<meta name="AUTHOR" content="Gloria Cortés">
<meta name="CREATED" content="20020903;6090096">
<meta name="CHANGEDBY" content="Gloria Cortés">
<meta name="CHANGED" content="20020903;6133657">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
</HEAD>
<BODY LANG="es-ES" class="container text-center">
<H1>
<IMG ID="imagen4" SRC="../imagenes/BD1.gif" NAME="Imagen1" ALIGN=CENTER WIDTH=700 HEIGHT=50><BR CLEAR=LEFT><BR><BR>
</H1>
<H1 ID="titulo4">Mi primera página HTML</H1>
<P>
<BR><BR>
</P>
</head>
<body lang="es-ES" class="container text-center">
<h1>
<img id="imagen4" src="../imagenes/BD4.gif" name="Imagen1" align="CENTER" width="700" height="50"><br clear="LEFT"><br><br>
</h1>
<h1 id="titulo4">Mi cuarta página HTML</h1>
<p>
<br><br>
</p>
<div class="row text-center">
<div class="col-md-6">
<span>&larr;</span><A HREF="pagina3.html">Mi tercera página HTML</A>
<span>←</span><a href="pagina3.html">Mi tercera página HTML</a>
</div>
<div class="col-md-6">
<A ID="enlace4" HREF="pagina2.html">Mi segunda página HTML</A><span>&rarr;</span>
<a id="enlace4" href="pagina5.html">Mi quinta página HTML</a><span>→</span>
</div>
</div>
</BODY>
</HTML>

</body></html>
32 changes: 15 additions & 17 deletions html/pagina5.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=UTF-8">
<TITLE>Mi primera página</TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.0 (Win32)">
<META NAME="AUTHOR" CONTENT="Gloria Cort&eacute;s">
<META NAME="CREATED" CONTENT="20020903;6090096">
<META NAME="CHANGEDBY" CONTENT="Gloria Cort&eacute;s">
<META NAME="CHANGED" CONTENT="20020903;6133657">
<!DOCTYPE html><html><head>
<meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
<title>Mi primera página</title>
<meta name="GENERATOR" content="OpenOffice.org 1.0 (Win32)">
<meta name="AUTHOR" content="Gloria Cortés">
<meta name="CREATED" content="20020903;6090096">
<meta name="CHANGEDBY" content="Gloria Cortés">
<meta name="CHANGED" content="20020903;6133657">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
</HEAD>
<BODY LANG="es-ES" class="container text-center">
<H1>
<IMG ID="imagen5" SRC="../imagenes/BD1.gif" NAME="Imagen1" ALIGN=CENTER WIDTH=700 HEIGHT=50><BR CLEAR=LEFT><BR><BR>
<IMG ID="imagen5" SRC="../imagenes/BD5.gif" NAME="Imagen1" ALIGN=CENTER WIDTH=700 HEIGHT=50><BR CLEAR=LEFT><BR><BR>
</H1>
<H1 ID="titulo5">Mi primera página HTML</H1>
<H1 ID="titulo5">Mi quinta página HTML</H1>
<P>
<BR><BR>
</P>
<div class="row text-center">
<div class="col-md-6">
<span>&larr;</span><A HREF="pagina4.html">Mi cuarta página HTML</A>
<span>←</span><a href="pagina4.html">Mi cuarta página HTML</a>
</div>
<div class="col-md-6">
<A ID="enlace5" HREF="pagina2.html">Mi segunda página HTML</A><span>&rarr;</span>
<a id="enlace5" href="pagina1.html">Mi primera página HTML</a><span>→</span>
</div>
</div>
<P></P>
</BODY>
</HTML>
<p></p>

</body></html>