Skip to content

Master #16

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 5 commits into
base: master
Choose a base branch
from
Open

Master #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39083dd
Tareas Bootcamp topic 0
Gonza07 Apr 22, 2016
d940858
Topic 0 - 2.3
Gonza07 Apr 26, 2016
1bc81c4
Update ESTILOS.css
Gonza07 Apr 26, 2016
fdf34a5
Update Topic 0 i - ii - iii.html
Gonza07 Apr 26, 2016
fc86452
Proyecto Bootcamp
Gonza07 Apr 26, 2016
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
38 changes: 38 additions & 0 deletions Ejercicio css/ESTILOS.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#container{
background-color: black;
height: 900px;
}

header{
height: 150px;
width: 100%;
background-color: red;
}

nav{
float: left;
background-color: orange;
height: 650px;
width: 15%;
}

aside{
float: right;
background-color: yellow;
height: 650px;
width: 15%;
}

footer{
background-color:darkgreen;
height: 100px;
width: 100%;
margin-top: 650px;
}

section{
float: left;
background-color: deepskyblue;
height: 650px;
width: 70%;
}
30 changes: 30 additions & 0 deletions Ejercicio css/Topic 0 - 2 CSS.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<!DOCTYPE html>

<html>
<head>
<title>TODO supply a title</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="estilos.css" rel="stylesheet" type="text/css"/>
</head>
<body>
<div id="contenedora">
<header>
</header>
<nav>

</nav>

<section>

</section>
<aside>

</aside>
<footer>

</footer>
</div>

</body>
</html>
77 changes: 77 additions & 0 deletions Proyecto/actores.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<!DOCTYPE html>
<!--
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
-->
<html>
<head>
<title>Portal Cinema</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="funcionesProyecto.js" type="text/javascript"></script>
<script src="jquery.js" type="text/javascript"></script>
<link href="estilosProyecto.css" rel="stylesheet" type="text/css"/>

</head>
<body>

<div class="general">
<header>
<h1> Portal Cinema </h1>
<img src="imgs/cinemaLogo.jpg" class="img-responsive" alt="Logo" title="Logo Portal Cinema"/>
<nav>
<!-- Navigation menu -->
<ul class="nav">
<li><a href="">Home</a></li>
<li><a href="">Premiers</a>
<ul>
<li><a href="">Worldwide</a></li>
<li><a href="">National</a></li>



</ul>
</li>
<li><a href="actores.html">Actors</a>
<ul>
<li><a href="">Hollywood World</a></li>
<li><a href="">News</a></li>

</ul>
</li>
<li><a href="">Contact</a></li>
</ul>
</nav>

<!-- End of navigation menu -->

</header>

<section>
<article class="artActores">

</article>

<article class="artActores">

</article>

<article class="artActores">

</article>
</section>



<footer>
<ul>
<li><a href="index.html">Home</a></li>
<li><a href="actores.html">Actors</a></li>
<li><a href="contacto.html">Contact</a></li>
</ul>
</footer>
</div>
</body>

</html>
69 changes: 69 additions & 0 deletions Proyecto/contacto.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<!DOCTYPE html>
<!--
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
-->
<html>
<head>
<title>Portal Cinema</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="funcionesProyecto.js" type="text/javascript"></script>
<script src="jquery.js" type="text/javascript"></script>
<link href="estilosProyecto.css" rel="stylesheet" type="text/css"/>

</head>
<body>

<div class="general">
<header>
<h1> Portal Cinema </h1>
<img src="imgs/cinemaLogo.jpg" class="img-responsive" alt="Logo" title="Logo Portal Cinema"/>

<!-- Navigation menu -->

<nav>
<ul class="nav">
<li><a href="index.html">Home</a></li>
<li><a href="estreno.html">Premiers</a>
<ul>
<li><a href="">Worldwide</a></li>
<li><a href="">National</a></li>



</ul>
</li>
<li><a href="actores.html">Actors</a>
<li>
<ul>
<li><a href="">Hollywood world</a></li>
<li><a href="">News</a></li>

</ul>
</li>
<li><a href="contacto.html">Contact</a></li>
</ul>
</nav>

<!-- End of navigation menu -->

</header>
<section>


</section>


<footer>
<ul>
<li><a href="index.html">Home</a></li>
<li><a href="actores.html">Actors</a></li>
<li><a href="contacto.html">Contact</a></li>
</ul>
</footer>
</div>
</body>

</html>
Loading