Skip to content

Correcciones y avances #11

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
MaxGarro wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Correcciones y avances #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ababd2a
Primer Commit
MaxGarro Aug 5, 2013
ef27fe7
Agregando Actividades
Aug 5, 2013
d116594
Actividades Agregadas
MaxGarro Aug 6, 2013
d46cdb3
Versión desktop beta
MaxGarro Aug 6, 2013
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
62 changes: 51 additions & 11 deletions estilos.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
a
{
color: #DD4F24;
text-decoration: none;
}
a:hover
{
color: #DD4F24;
text-decoration: underline;
}
body
{
Expand Down Expand Up @@ -42,6 +48,7 @@ header
color: white;
margin: 0;
padding: 0.5em;
position: relative;
}
header:after{
clear: both;
Expand All @@ -55,23 +62,22 @@ header figure
header h1
{
font-size: 20px;
font-weight: normal;
margin: 1em 85px 1em 100px;
display: block;
}
header #avatar
{
margin: 1em 1em 0 0;
position: absolute;
top: 0;
right: 0;
margin: 1em 1em 0 0;
}
header #avatar figcaption
{
background: #22BCE0;
float: right;
height: 50px;
line-height: 50px;
margin-left: 50px;
}
header #avatar figcaption:after
{
Expand All @@ -89,9 +95,34 @@ header #logo img
{
width: 80px;
}
header #home{
background: #22BCE0;
border-radius: 0.5em 0.5em 0 0;
bottom:0;
font-size: 0.9em;
margin: 0;
padding: 0.5em 0.7em;
position: absolute;
right: 10em;
text-align: left;
vertical-align: bottom;
}
header #home:after
{
content: "\e002";
font-family: "icomoon";
font-size: 0.7em;
opacity: 0.5;
}
header #home a{
color:#fff;
text-decoration: none;
margin-right: 2em;
}
nav
{
background: #878787;
border-top: 4px solid #7f7f7f;
font-size: 0.9em;
}
nav ul
Expand All @@ -103,14 +134,23 @@ nav ul
nav ul li
{
display: inline-block;
margin: 0 1.2em 0 0;
margin: -4px 1.2em 0 0;
vertical-align: top;
}
nav ul li a
{
color: white;
display: block;
padding: 0.5em 0;
text-decoration: none;
}
nav ul li a:hover
{
text-decoration: underline;
}
nav #flechita_nav
{
border-top: 4px solid #25a3be;
}
nav #flechita_nav a
{
Expand All @@ -128,6 +168,7 @@ nav #publicar_nav
{
/*i is zorri*/
background: #DD4F24;
border-top: 4px solid #bd5b38;
float: right;
margin-right: 0;
padding-right: 1em;
Expand All @@ -138,8 +179,9 @@ nav #publicar_nav:after
color: rgba(255,255,255,0.5);
content: "\e004";
font-family: "icomoon";
font-size: 1.8em;
font-size: 1.4em;
position: absolute;
line-height: 1.4em;
right: 0;
top: 0;
}
Expand All @@ -149,10 +191,6 @@ nav #publicar_nav a
padding: 0.5em 1em;
text-decoration: none;
}
#bienvenida
{
display: none;
}
#contenido
{
margin: 1em;
Expand Down Expand Up @@ -189,7 +227,7 @@ nav #publicar_nav a
border-right: 5px solid transparent;
border-top: 5px solid #878787;
content: "";
left :10px;
right :5px;
position: absolute;
top:100%;
}
Expand Down Expand Up @@ -231,7 +269,6 @@ nav #publicar_nav a
#contenido .item .titulo_item a
{
color: #444;
text-decoration: none;
}
#contenido .item .votacion
{
Expand Down Expand Up @@ -266,6 +303,9 @@ nav #publicar_nav a
content: "\e002";
}

.desktop{
display: none;
}



Expand Down
83 changes: 65 additions & 18 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<head>
<meta charset="utf-8" />

<meta name="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />

<title>Puls3: Comunidad online de gente pro y (no sé que más escribir)</title>
<link rel="shortcut icon" href="logo.ico" />
<link rel="stylesheet" href="normalize.css" />
<link href='http://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic' rel='stylesheet' type='text/css' />
<link rel="stylesheet" href="estilos.css" />
Expand All @@ -20,9 +20,15 @@
</figure>
<h1 id="titulo_header">Puls3: Comunidad de gente cool, atractiva y millonaria</h1>
<figure id="avatar">
<img src="avatar.jpg" />
<img src="http://placehold.it/100x100" />
<figcaption></figcaption>
</figure>
<p id="home">
<a href="#">
Home
</a>
</p>

</header>
<nav>
<ul>
Expand All @@ -35,21 +41,62 @@ <h1 id="titulo_header">Puls3: Comunidad de gente cool, atractiva y millonaria</h
<li id="publicar_nav"><a href="#">Publicar</a></li>
</ul>
</nav>
<aside id="bienvenida">
<h2>Hola, registrate!</h2>
<p>Es importante registrarte porque LOL!</p>
<a id="registro" href="#">Registrate acá</a>
<p id="mensaje_registro">En serio, registrate por favor</p>
<!-- <video width="300" controls>
<source src="happyfit.webm" type="video/webm" />
<source src="happyfit.mp4" type="video/mp4" />
<p>SU NAVEGADOR ES VIEJO DE COJONES!!</p>
</video> -->
<aside id="desktop_barra" class="desktop">
<aside id="bienvenida">
<h2>Hola, registrate!</h2>
<p>Registrate</p>
<a id="registro" href="#">Registrate acá</a>
<p id="mensaje_registro">En serio, registrate por favor</p>
<!-- <video width="300" controls>
<source src="happyfit.webm" type="video/webm" />
<source src="happyfit.mp4" type="video/mp4" />
<p>SU NAVEGADOR ES VIEJO DE COJONES!!</p>
</video> -->
</aside>
<section id="actividades">
<h2 id="titulo_actividades"><a href="#">Actividad</a></h2>
<article class="actividades">
<a href="#" class="comentarios_actividades">3134</a>
<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Phasellus hendrerit. Pellentesque.</p>
</article>
<article class="actividades">
<a href="#" class="comentarios_actividades">3134</a>
<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Phasellus hendrerit. Pellentesque.</p>
</article>
<article class="actividades">
<a href="#" class="comentarios_actividades">3134</a>
<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Phasellus hendrerit. Pellentesque.</p>
</article>
<article class="actividades">
<a href="#" class="comentarios_actividades">3134</a>
<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Phasellus hendrerit. Pellentesque.</p>
</article>
</section>
</aside>
<section id="contenido_destacado" class="desktop">
<article id="item_destacado">
<figure>
<img src="http://placehold.it/1680x800" />
</figure>
<div id="item_articulo">
<p class="votacion_destacado">
<a class="up" href="#"></a>
3141
<a class="down" href="#"></a>
</p>
<h2 class="titulo_item">
<a href="#">Una mirada a Leap Motion: El control Minority Report</a>
</h2>
<p class="autor_item">
Por <a href="#">Freddy Vega</a>
</p>
</div>
</article>
</section>
<section id="contenido">
<article class="item">
<figure class="imagen_item">
<img src="imagen.jpg" />
<img src="http://placehold.it/192x256" />
</figure>
<h2 class="titulo_item">
<a href="#">Una mirada a Leap Motion: El control Minority Report</a>
Expand All @@ -71,7 +118,7 @@ <h2 class="titulo_item">
</article>
<article class="item">
<figure class="imagen_item">
<img src="imagen.jpg" />
<img src="http://placehold.it/192x256" />
</figure>
<h2 class="titulo_item">
<a href="#">Una mirada a Leap Motion: El control Minority Report</a>
Expand All @@ -93,7 +140,7 @@ <h2 class="titulo_item">
</article>
<article class="item">
<figure class="imagen_item">
<img src="imagen.jpg" />
<img src="http://placehold.it/192x256" />
</figure>
<h2 class="titulo_item">
<a href="#">Una mirada a Leap Motion: El control Minority Report</a>
Expand All @@ -115,7 +162,7 @@ <h2 class="titulo_item">
</article>
<article class="item">
<figure class="imagen_item">
<img src="imagen.jpg" />
<img src="http://placehold.it/192x256" />
</figure>
<h2 class="titulo_item">
<a href="#">Una mirada a Leap Motion: El control Minority Report</a>
Expand All @@ -137,7 +184,7 @@ <h2 class="titulo_item">
</article>
<article class="item">
<figure class="imagen_item">
<img src="imagen.jpg" />
<img src="http://placehold.it/192x256" />
</figure>
<h2 class="titulo_item">
<a href="#">Una mirada a Leap Motion: El control Minority Report</a>
Expand Down
Binary file added logo.ico
View file
Open in desktop
Binary file not shown.
Loading