consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #690 from AyuntamientoMadrid/featured_debates

Browse Source 
Featured debates
This commit is contained in:
Juanjo Bazán
2015-11-13 12:27:31 +01:00
parent 8b55d0a7c6 ca55b43e7c
commit a8e991eea2
6 changed files with 148 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/featured_debates.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

131
app/assets/stylesheets/participation.scss
View File

@@ -4,7 +4,7 @@
// 02. New participation
// 03. Show participation
// 04. List participation
// 05. Featured proposals
// 05. Featured
//
// 01. Votes and supports
@@ -827,12 +827,28 @@
}
}
// 05. Featured proposals
// 05. Featured
// - - - - - - - - - - - - - - - - - - - - - - - - -
.featured-debates-container {
background: $votes-bg;
@media (min-width: $medium-breakpoint) {
margin-left: 0 !important;
margin-right: 0 !important;
}
h2 {
color: white;
}
.debates-list {
margin-bottom: 0;
}
}
.featured-proposals-container {
background: #FED900;
margin: 0 !important;
@media (min-width: $medium-breakpoint) {
margin-left: 0 !important;
@@ -841,14 +857,21 @@
h2 {
color: $text;
font-size: rem-calc(24);
margin: rem-calc(12) 0 0;
position: relative;
text-transform: uppercase;
@media (min-width: $medium-breakpoint) {
margin-bottom: rem-calc(27);
}
}
}
.featured-debates-container, .featured-proposals-container {
margin: 0 !important;
h2 {
font-size: rem-calc(24);
margin: rem-calc(12) 0 0;
position: relative;
text-transform: uppercase;
.icon-proposals {
font-size: rem-calc(20);
@@ -858,34 +881,97 @@
}
}
.debates-list {
@media (min-width: $medium-breakpoint) {
border-left: 1px solid $votes-border;
}
&:after {
@media (min-width: $medium-breakpoint) {
content: none;
}
}
}
.proposals-list {
margin: rem-calc(6) 0;
@media (min-width: $medium-breakpoint) {
border-left: 1px solid #D2B400;
}
&:after {
content: none;
position: absolute;
display: block;
border-style: solid;
border-color: #C9AF00 transparent transparent transparent;
bottom: rem-calc(-20);
border-left-width: 0;
border-right-color: transparent;
right: rem-calc(1);
border-width: rem-calc(14) rem-calc(14) 0 0;
@media (min-width: $medium-breakpoint) {
content: " ";
}
}
}
.debates-list, .proposals-list {
margin: rem-calc(6) 0;
&:after {
content: none;
position: absolute;
display: block;
border-style: solid;
bottom: rem-calc(-20);
border-left-width: 0;
border-right-color: transparent;
right: rem-calc(1);
border-width: rem-calc(14) rem-calc(14) 0 0;
}
}
}
.debate-featured {
background: $votes-bg;
margin: rem-calc(12) 0 !important;
.panel h3 a {
color: #0D3F54;
text-transform: none;
&:first-letter {
text-transform: none;
}
}
.info, .info a {
color: white !important;
}
.content {
height: auto;
}
}
.proposal-featured {
background: #FED900;
.panel h3 a {
color: $text;
text-transform: lowercase;
&:first-letter {
text-transform: uppercase;
}
}
.info {
color: #806C00 !important;
}
.content {
height: rem-calc(60);
}
}
.debate-featured, .proposal-featured {
margin-bottom: 0;
margin-top: 0;
padding-left: 0;
@@ -903,15 +989,9 @@
a {
clear: both;
color: $text;
display: block;
font-size: rem-calc(14);
line-height: $line-height;
text-transform: lowercase;
&:first-letter {
text-transform: uppercase;
}
}
}
}
@@ -921,14 +1001,9 @@
}
.content {
height: rem-calc(60);
overflow: hidden;
}
.info {
color: #806C00 !important;
}
.supports {
@include supports;
background: none;

41
app/views/debates/_featured_debates_static.html.erb Normal file
View File

@@ -0,0 +1,41 @@
<div id="featured-debates" class="row featured-debates-container">
<div class="small-12 medium-3 column">
<h2>
<%= t("debates.index.featured_debates_html") %>
</h2>
<span class="show-for-medium-up">
<%= image_tag("featured_debates.jpg", size: "210x135") %>
</span>
</div>
<div class="small-12 medium-9 column debates-list">
<div class="debate-featured small-12 column">
<div class="panel">
<div class="content small-12 left">
<h3>
<%= link_to "¿Y si cualquiera pudiera entrevistar a Manuela Carmena o a los otros concejales?", "https://decide.madrid.es/debates/4299" %></h3>
<div class="info">
<span class="author">
<%= link_to "ParticipaciónYTransparenciaAytoMadrid", "https://decide.madrid.es/users/52055"%>
</span>
</div>
</div>
</div>
</div>
<div class="debate-featured small-12 column">
<div class="panel">
<div class="content small-12 left">
<h3>
<%= link_to "#TúPreguntas: Carlos Sánchez Mato, concejal de Economía y Hacienda.", "https://decide.madrid.es/debates/4298" %></h3>
<div class="info">
<span class="author">
<%= link_to "Carlos Sánchez", "https://decide.madrid.es/users/13"%>
</span>
</div>
</div>
</div>
</div>
</div>
</div>

2
app/views/debates/index.html.erb
View File

@@ -44,6 +44,8 @@
<%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button radius expand' %>
</div>
<%= render "featured_debates_static" %>
<%= render @debates %>
<%= paginate @debates %>
</div>

1
config/locales/en.yml
View File

@@ -79,6 +79,7 @@ en:
debates:
index:
title: "Debates"
featured_debates_html: "Featured<br>debates"
start_debate: "Start a debate"
select_order: "Order by"
select_order_long: "You are viewing debates according to:"

1
config/locales/es.yml
View File

@@ -79,6 +79,7 @@ es:
debates:
index:
title: "Debates"
featured_debates_html: "Debates<br>destacados"
start_debate: "Empieza un debate"
select_order: "Ordenar por"
select_order_long: "Estás viendo los debates"