Skip to content

Commit

Permalink
Merge pull request #48 from carlosp420/master
Browse files Browse the repository at this point in the history
added my avatar and fixed layout in xs screens
  • Loading branch information
carlosp420 committed Sep 29, 2016
2 parents 44a38fb + 301fc69 commit ae2f609
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
Binary file added manolo/assets/img/carlos_avatar_2015.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 14 additions & 11 deletions manolo/templates/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{% block content %}

<div class="container">
<div class="container-fluid">
<div class="row">
<div class="col-sm-10 col-md-7">

Expand All @@ -23,24 +23,27 @@ <h2>Programadores</h2>


<div class="row">
<div class="col-xs-7 col-sm-6 col-md-5 col-lg-4">
<div class="col-xs-11 col-sm-6 col-md-5 col-lg-4">
<div class="panel panel-default">
<div class="panel-body">

<div class="media">
<div class="media-left media-middle">
<a href="#">
<img class="media-object img-circle" src="{% static 'img/avatar_aniversarioperu.png' %}" alt="AniversarioPeru" />
</a>
<img class="media-object img-circle"
src="{% static 'img/carlos_avatar_2015.png' %}"
alt="Carlos Peña" />
</div>
<div class="media-body">
<h4 class="media-heading">AniversarioPeru</h4>
<small>Troll.</small>
<h4 class="media-heading">Carlos Peña</h4>
<small> programmer/biologist</small>
<p>
<br />
<a href="https://github.com/aniversarioperu/"><i class="fa fa-github-alt fa-lg fa-fw"></i></a>
<a href="https://twitter.com/aniversarioperu"><i class="fa fa-twitter fa-lg fa-fw"></i></a>
<a href="http://aniversarioperu.me/"><i class="fa fa-external-link fa-lg fa-fw"></i></a>
<a href="https://github.com/carlosp420/"><i class="fa fa-github-alt fa-lg fa-fw"></i></a>
<a href="https://twitter.com/carlosp420"><i class="fa fa-twitter fa-lg fa-fw"></i></a>
<a href="http://mycalesis.me/"><i class="fa fa-external-link fa-lg fa-fw"></i></a>
<br />
a.k.a:
<a href="https://twitter.com/aniversarioperu"> @aniversarioperu </a>
</p>

</div>
Expand All @@ -50,7 +53,7 @@ <h4 class="media-heading">AniversarioPeru</h4>
</div>
</div><!-- col -->

<div class="col-xs-7 col-sm-6 col-md-5 col-lg-4">
<div class="col-xs-11 col-sm-6 col-md-5 col-lg-4">
<div class="panel panel-default">
<div class="panel-body">

Expand Down
7 changes: 3 additions & 4 deletions manolo/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<li><a href="/cazador/">Manolo Cazador</a></li>
<li><a href="/docs/">Developers</a></li>
<li><a href="/docs/">API</a></li>
<li><a href="/about/">About Manolo</a></li>
</ul>
</div><!--/.nav-collapse -->
Expand All @@ -71,7 +71,7 @@



<div class="container">
<div class="container-fluid">
<div class="well"><b>Disclaimer:</b> La info presentada
en esta herramienta web (o sea <b>Manolo</b>) es referencial y no tiene valor legal.
Para denuncias y otras cuestiones legales debes verificar con las fuentes originales
Expand All @@ -92,8 +92,7 @@
Los datos en Manolo son obtenidos con escrapers construidos con el framework
<a href="http://scrapy.org/">Scrapy</a>.
<br />
<br />
&copy; 2015 Desarrollado por <a href="https://twitter.com/AniversarioPeru">AniversarioPeru<i class="fa fa-twitter"></i></a>
&copy; 2015-2016 Desarrollado por <a href="https://twitter.com/AniversarioPeru">Carlos Peña<i class="fa fa-twitter"></i></a>
&amp; <a href="https://twitter.com/matiskay">Edgar Marca<i class="fa fa-twitter"></i></a>
<br />
<br />
Expand Down

0 comments on commit ae2f609

Please sign in to comment.