Skip to content

Commit

Permalink
Merge pull request #934 from /issues/921/perfilcandidaturas
Browse files Browse the repository at this point in the history
@lissteilor arriba los ❤️  y abajo los 👖 !
  • Loading branch information
lfalvarez committed Oct 4, 2017
2 parents eb9af66 + a3918fe commit 7b23973
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 11 deletions.
Binary file modified votai_general_theme/static/img/candidate-default.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions votai_general_theme/static/sass/_media-2017sitio1.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,18 @@
}
}

@media screen and (max-width: 900px) {
#home-search:after{
display: none;
}
}

@media screen and (max-width: 784px) {
#home-search input{
width: 90%;
}
}

@media screen and (max-width: 560px) {
#welcome{
h1{
Expand Down
19 changes: 10 additions & 9 deletions votai_general_theme/templates/elections/area.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,18 @@
<li><a href="{% url 'know_your_candidates' %}" onclick="ga('send','event','breadcrumb-candidaturas-area','click')">Candidaturas</a></li>
<li class="active">{{area.name}}</li>
<h1>Candidatos para {{area}}</h1>
{% if area.get_containing_filterable_areas %}
<h4>Comunas de {{area}}</h4>
{% for comuna in area.get_containing_filterable_areas %}
{{comuna}}
{% if not forloop.last %}
,
{% endif%}
{% endfor %}
{% endif %}
</ol>
{% for p in area.parents %}
{% with p.elections.first as election %}
{% if election %}
<span class="label label-primary"><a href="#election-area-{{p.id}}">{{p}}</a></span>
{% endif %}
{% endwith %}
{% endfor %}
</div>



{% for p in area.parents %}
{% with p.elections.first as election %}
{% if election %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ <h3 class="text-center">Compromisos Ciudadanos</h3>
{% if user|is_candidate %}
{{candidate.name}} aun no te haz comprometido! Es hora de
{% else %}
<p>Este candidato aún no se ha comprometido</p>
<p class="text-center">Este candidato aún no se ha comprometido</p>
{% endif %}
{% endif %}

Expand Down
16 changes: 15 additions & 1 deletion votai_general_theme/templates/elections/election_card.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
{% load thumbnail %}
{% load static %}

<div class="container" itemscope itemtype="http://schema.org/Person">
<div id="election-area-{{election.area.id}}" class="container" itemscope>
{% if election %}
<div class="text-center">
<h2>{{election.name}}</h2>
{% if election.area.get_containing_filterable_areas %}
<h4>Comunas</h4>
{% for comuna in election.area.get_containing_filterable_areas %}
{{comuna}}
{% if not forloop.last %}
,
{% endif%}
{% endfor %}
{% endif %}
</div>
<div class="row">
{% for candidate in election.candidates.all %}
<div class="col-md-3">
Expand All @@ -26,4 +38,6 @@ <h2>{{election.name}}</h2>
{% endif %}
{% endfor %}
</div>
{% else %}
{% endif %}
</div>

0 comments on commit 7b23973

Please sign in to comment.