Skip to content

Commit

Permalink
Merge pull request #835 from /issues/831/cambioshome
Browse files Browse the repository at this point in the history 
Issues/831/cambioshome
  • Loading branch information
@lissteilor
lissteilor committed Aug 7, 2017
2 parents 4fb2821 + 2324288 commit 1b5ac76
Show file tree
Hide file tree
Showing 3 changed files with 97 additions and 39 deletions.
85 changes: 58 additions & 27 deletions votai_general_theme/static/sass/_2017sitio1.scss
View file
Expand Up @@ -101,15 +101,39 @@ td.cal-date{
letter-spacing: 0;
}

#you-org{
#proposals-counter{
min-height: 60px;
color: white;
font-family: 'Montserrat', sans-serif;
font-weight: 700;
text-transform: uppercase;
letter-spacing: 2px;
font-size: 12px;
padding-top: 10px;
}

.counter-number{
font-family: 'Arvo', serif;
color: $blue;
font-weight: 700;
font-size: 44px;
position: relative;
top: 9px;
}

#you-org{
min-height: 60px;
color: white;
font-family: 'Montserrat', sans-serif;
font-weight: 700;
text-transform: uppercase;
letter-spacing: 2px;
font-size: 10px;
padding-top: 12px;
line-height: 12px;
.btn{
font-size: 10px;
}
}

#actions{
Expand All @@ -131,11 +155,6 @@ td.cal-date{
background-position: center;
padding-top: 180px;
margin-bottom: 70px;
&:hover{
color: $blue;
background: url("../img/a-encuentro-h.svg") no-repeat;
background-position: center;
}
}

.action-crea{
Expand All @@ -145,11 +164,6 @@ td.cal-date{
background-position: center;
padding-top: 180px;
margin-bottom: 70px;
&:hover{
color: $blue;
background: url("../img/a-crea-h.svg") no-repeat;
background-position: center;
}
}

.action-apoya{
Expand All @@ -159,15 +173,19 @@ td.cal-date{
background-position: center;
padding-top: 180px;
margin-bottom: 70px;
&:hover{
color: $blue;
background: url("../img/a-apoya-h.svg") no-repeat;
background-position: center;
}
}

#education{
margin-bottom: 60px;
.btn{
font-size: 11px;
}
h2 > a{
color: $grey-one;
&:hover{
color: $blue;
}
}
}

.edu-1{
Expand Down Expand Up @@ -538,14 +556,6 @@ input[type=file]{
border-radius: 5px;
height: 230px;
padding: 30px 15px;
img{
margin: 0 auto;
height: 140px;
margin-bottom: 15px;
}
}

.set-guide{
font-family: 'Montserrat', sans-serif;
font-weight: 700;
letter-spacing: 1.3px;
Expand All @@ -556,9 +566,13 @@ input[type=file]{
&:hover{
color: $blue;
}
img{
margin: 0 auto;
height: 140px;
margin-bottom: 15px;
}
}


/*Botones*/
.btn-blue{
background-color: $blue;
Expand All @@ -572,14 +586,31 @@ input[type=file]{
.btn-white{
background-color: white;
color: $grey-one;
word-wrap:break-word;
white-space: normal;
&:hover{
background-color: $grey-one;
color: white;
}
}

.btn-line{
background-color: white;
color: $grey-one;
border: 3px solid $grey-five;
&:hover{
border: 3px solid $grey-one;
background-color: $grey-one;
color: white;
}
}

.btn{
word-wrap: break-word;
white-space: normal;
&:hover{
box-shadow: none;
}
}

/*RIBBONS*/
.product {
margin: 50px auto;
Expand Down
17 changes: 17 additions & 0 deletions votai_general_theme/static/sass/_media-2017sitio1.scss
View file
Expand Up @@ -47,6 +47,16 @@
}
}

@media screen and (max-width: 495px) {
#you-org{
.btn{
margin-top: 10px;
}
}
}



@media screen and (max-width: 425px) {
.content_padding {
padding-top: 20px;
Expand All @@ -65,6 +75,13 @@
}
}

@media screen and (max-width: 397px) {
.counter-number{
font-size: 32px;
top: 5px;
}
}

@media screen and (max-width: 388px) {
.org-info h2{
margin-top: 120px;
Expand Down
34 changes: 22 additions & 12 deletions votai_general_theme/templates/index_first_launch.html
View file
Expand Up @@ -19,11 +19,11 @@
</div>
</section>

<section id="you-org" class="grey-one">
<section id="proposals-counter" class="grey-one">
<div class="container">
<div class="row">
<div class="col-md-12 text-center">
<p>¿Eres una organización? <a href="{% url 'auth_login' %}" class="btn btn-blue" onclick="ga('send', 'event', 'home-invitacion-ong', 'click')">Ingresa aquí</a></p>
<p>Tenemos <span class="counter-number">{{total_proposals}}</span> propuestas ciudadanas</p>
</div>
</div>
</div>
Expand All @@ -34,26 +34,26 @@
<div class="row">
<h2 class="text-center">Propuestas ciudadanas</h2>
<div class="col-md-4 text-center">
<a href="{% url 'encuentro_ciudadano' %}" onclick="ga('send', 'event', 'home-realiza-encuentro', 'click')">
<div class="action-encuentro"><p class="action">Realiza un encuentro</p></div>
</a>
<div class="action-encuentro">
<a href="{% url 'encuentro_ciudadano' %}" onclick="ga('send', 'event', 'home-realiza-encuentro', 'click')" class="btn btn-line">Realiza un encuentro</a>
</div>
</div>
<div class="col-md-4 text-center">
<a href="{% url 'popular_proposals:propose_wizard_full_without_area' %}" onclick="ga('send', 'event', 'home-crea-propuesta', 'click')">
<div class="action-crea"><p class="action">Crea una propuesta</p></div>
</a>
<div class="action-crea">
<a href="{% url 'popular_proposals:propose_wizard_full_without_area' %}" onclick="ga('send', 'event', 'home-crea-propuesta', 'click')" class="btn btn-line">Crea una propuesta</a>
</div>
</div>
<div class="col-md-4 text-center">
<a href="{% url 'popular_proposals:home' %}" onclick="ga('send', 'event', 'home-conoce-apoya', 'click')">
<div class="action-apoya"><p class="action">Conoce y apoya propuestas</p></div>
</a>
<div class="action-apoya">
<a href="{% url 'popular_proposals:home' %}" onclick="ga('send', 'event', 'home-conoce-apoya', 'click')" class="btn btn-line">Conoce y apoya propuestas</a>
</div>
</div>
</div>
</div>
</section>

<section id="education" class="container-fluid">
<h2 class="text-center">Material ciudadano</h2>
<h2 class="text-center"><a href="{% url 'material_ciudadano' %}" onclick="ga('send', 'event', 'home-material-ciudadano', 'click')">Material ciudadano</a></h2>
<div class="row">
<div class="col-md-6 text-center blue edu-1">
<a href="{% static 'material-ciudadano/manual-formacion-ciudadana.pdf' %}" target="_blank" class="btn btn-white" onclick="ga('send', 'event', 'home-manual-formacion-ciudadana', 'click')">Manual de formación ciudadana</a>
Expand All @@ -65,3 +65,13 @@ <h2 class="text-center">Material ciudadano</h2>
</section>

{% organization_logos %}

<section id="you-org" class="grey-one">
<div class="container">
<div class="row">
<div class="col-md-12 text-center">
<p>¿Eres una organización y quieres estar aquí? <a href="{% url 'auth_login' %}" class="btn btn-blue" onclick="ga('send', 'event', 'home-invitacion-ong', 'click')">Ingresa</a></p>
</div>
</div>
</div>
</section>

0 comments on commit 1b5ac76

Please sign in to comment.