Skip to content

FIX2: Corrección en páginas #109

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

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

FIX2: Corrección en páginas #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5d45a69
FIX1: Corrección en pagina5 (imagen y título) y pagina3 (enlace y texto)
Juanka0129 Sep 5, 2025
bc550ad
Merge pull request #2 from Juanka0129/fix_1
Juanka0129 Sep 5, 2025
be08d60
FIX2: Corrección de convención de commit
Juanka0129 Sep 5, 2025
1b421db
Merge pull request #4 from Juanka0129/fix_2
Juanka0129 Sep 5, 2025
f51b333
FIX2: Corrección de convención de commit
Juanka0129 Sep 5, 2025
39157ff
Merge pull request #5 from Juanka0129/fix_2
Juanka0129 Sep 5, 2025
a5cb205
FIX1: Corrección en pagina5 (imagen y título) y pagina3 (enlace y texto)
Juanka0129 Sep 7, 2025
1dc3ae7
FIX1: Ajuste menor; confirmar imagen5 y titulo5 según issue
Juanka0129 Sep 7, 2025
d618915
FIX1: Ajuste final imagen5 y titulo5 según issue
Juanka0129 Sep 7, 2025
ed64bda
Merge pull request #6 from Juanka0129/fix_1
Juanka0129 Sep 7, 2025
ea0dde2
FIX1: Confirmación final de cambios en pagina5 y pagina3
Juanka0129 Sep 7, 2025
f1521ec
FIX1: Corregir enlace3 en pagina3.html (href y texto)
Juanka0129 Sep 7, 2025
b3edd22
FIX1: Ajuste final enlace3 en pagina3.html
Juanka0129 Sep 7, 2025
e09277f
FIX1: Ajuste final enlace3 en pagina3.html (href=pagina4.html y texto…
Juanka0129 Sep 7, 2025
70edbdf
Update #titulo1, #imagen1, #enlace1, #enlace1, of file html/pagina1.…
Sep 7, 2025
a11725e
Update #titulo2, #imagen2, #enlace2, #enlace2, of file html/pagina2.…
Sep 7, 2025
e849328
Update #titulo3, #imagen3, #enlace3, #enlace3, of file html/pagina3.…
Sep 7, 2025
e44f811
Update #titulo4, #imagen4, #enlace4, #enlace4, of file html/pagina4.…
Sep 7, 2025
f2381f7
Update #titulo5, #imagen5, #enlace5, #enlace5, of file html/pagina5.…
Sep 7, 2025
833ea84
Merge automático
static-web-project[bot] Sep 7, 2025
b45c3e0
MERGE1: Merge de las correcciones
Juanka0129 Sep 7, 2025
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>
48 changes: 24 additions & 24 deletions html/pagina3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<!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">
<!-- Ajuste menor para convención de commit (FIX2) -->
<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>
</div>
<a id="enlace3" href="pagina4.html">Mi cuarta página HTML</a>
</div>
</div>
</BODY>
</HTML>
<!-- cambio menooor -->

</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>
47 changes: 23 additions & 24 deletions html/pagina5.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
<!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>
</H1>
<H1 ID="titulo5">Mi primera página HTML</H1>
<P>
<BR><BR>
</P>
</head>
<body lang="es-ES" class="container text-center">
<h1>
<img id="imagen5" src="../imagenes/BD5.gif" alt="Mi quinta 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>
<!-- ajuste final para bot -->

</body></html>