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

Improves styles for featured debates

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2016-01-12 15:51:13 +01:00
parent 5ee8111143
commit edc20e9a0c
5 changed files with 55 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 17 KiB

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

@@ -789,8 +789,10 @@
// 05. Featured // 05. Featured
// - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - -
.featured-debates-container { .featured-debates {
background: $votes-bg; background: $highlight;
margin-top: $line-height !important;
padding: $line-height/2 0;
@media (min-width: $medium-breakpoint) { @media (min-width: $medium-breakpoint) {
margin-left: 0 !important; margin-left: 0 !important;
@@ -798,11 +800,19 @@
} }
h2 { h2 {
color: white; font-size: $small-font-size;
line-height: $line-height;
text-transform: uppercase;
} }
.debates-list { h3 a {
margin-bottom: 0; color: $text;
font-size: $h3-font-size;
}
a {
color: lighten($text, 15%);
font-size: $small-font-size;
} }
} }
@@ -815,7 +825,9 @@
} }
h2 { h2 {
color: $text; font-size: $small-font-size;
line-height: $line-height;
text-transform: uppercase;
@media (min-width: $medium-breakpoint) { @media (min-width: $medium-breakpoint) {
margin-bottom: rem-calc(27); margin-bottom: rem-calc(27);
@@ -823,14 +835,14 @@
} }
} }
.featured-debates-container, .featured-proposals-container { .featured-proposals-container {
margin: $line-height 0 !important; margin: $line-height 0 !important;
h2 { h2 {
font-size: rem-calc(24); // font-size: rem-calc(24);
margin: rem-calc(12) 0 0; // margin: rem-calc(12) 0 0;
position: relative; // position: relative;
text-transform: uppercase; // text-transform: uppercase;
.icon-proposals { .icon-proposals {
font-size: rem-calc(20); font-size: rem-calc(20);
@@ -840,20 +852,6 @@
} }
} }
.debates-list {
@media (min-width: $medium-breakpoint) {
border-left: 1px solid $votes-border;
}
&:after {
@media (min-width: $medium-breakpoint) {
content: none;
}
}
}
.proposals-list { .proposals-list {
@media (min-width: $medium-breakpoint) { @media (min-width: $medium-breakpoint) {
@@ -869,24 +867,24 @@
} }
} }
.debates-list, .proposals-list { // .debates-list, .proposals-list {
margin: rem-calc(6) 0; // margin: rem-calc(6) 0;
&:after { // &:after {
content: none; // content: none;
position: absolute; // position: absolute;
display: block; // display: block;
border-style: solid; // border-style: solid;
bottom: rem-calc(-20); // bottom: rem-calc(-20);
border-left-width: 0; // border-left-width: 0;
border-right-color: transparent; // border-right-color: transparent;
right: rem-calc(1); // right: rem-calc(1);
border-width: rem-calc(14) rem-calc(14) 0 0; // border-width: rem-calc(14) rem-calc(14) 0 0;
} // }
} // }
} }
.debate-featured, .proposal-featured { .proposal-featured {
margin-bottom: 0; margin-bottom: 0;
margin-top: 0; margin-top: 0;
padding-left: 0; padding-left: 0;
@@ -993,27 +991,6 @@
} }
} }
.debate-featured {
background: $votes-bg;
margin-bottom: rem-calc(12) !important;
.panel h3 a {
color: #0D3F54;
font-size: $h3-font-size;
margin: 0;
}
.info, .info a {
color: white !important;
font-family: $font-sans;
font-size: $small-font-size;
}
.content {
height: auto;
}
}
.proposal-featured { .proposal-featured {
background: #FED900; background: #FED900;

50
app/views/debates/_featured_debates_static.html.erb
View File

@@ -1,41 +1,17 @@
<div id="featured-debates" class="row featured-debates-container"> <div id="featured-debates" class="row featured-debates">
<div class="small-12 medium-3 column">
<h2> <div class="small-12 column">
<%= t("debates.index.featured_debates_html") %> <h2><%= t("debates.index.featured_debates") %></h2>
</h2>
<span class="show-for-medium-up">
<%= image_tag("featured_debates.jpg", size: "210x135") %>
</span>
</div> </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 "#Túpreguntas: Manuela Carmena, Alcaldesa de Madrid.", "https://decide.madrid.es/debates/4320" %></h3>
<div class="info">
<span class="author">
<%= link_to "Manuela Carmena ", "https://decide.madrid.es/users/21452"%>
</span>
</div>
</div>
</div>
</div>
<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="small-12 medium-6 column">
<h3><%= link_to "#Túpreguntas: Manuela Carmena, Alcaldesa de Madrid.", "https://decide.madrid.es/debates/4320" %></h3>
<%= link_to "Manuela Carmena ", "https://decide.madrid.es/users/21452"%>
</div> </div>
<div class="small-12 medium-6 column">
<h3><%= link_to "¿Y si pudieras entrevistar a Manuela Carmena o a los otros concejales?", "https://decide.madrid.es/debates/4299" %></h3>
<%= link_to "ParticipaciónYTransparenciaAytoMadrid", "https://decide.madrid.es/users/52055"%>
</div>
</div> </div>

4
config/locales/en.yml
View File

@@ -83,7 +83,7 @@ en:
debates: debates:
index: index:
title: "Debates" title: "Debates"
featured_debates_html: "Featured<br>debates" featured_debates: "Featured"
start_debate: "Start a debate" start_debate: "Start a debate"
select_order: "Order by" select_order: "Order by"
orders: orders:
@@ -158,7 +158,7 @@ en:
proposals: proposals:
index: index:
title: "Proposals" title: "Proposals"
featured_proposals_html: "Featured<br>proposals" featured_proposals: "Featured"
start_proposal: "Create a proposal" start_proposal: "Create a proposal"
select_order_long: "You are viewing proposals according to:" select_order_long: "You are viewing proposals according to:"
select_order: "Order by" select_order: "Order by"

4
config/locales/es.yml
View File

@@ -83,7 +83,7 @@ es:
debates: debates:
index: index:
title: "Debates" title: "Debates"
featured_debates_html: "Debates<br>destacados" featured_debates: "Destacados"
start_debate: "Empieza un debate" start_debate: "Empieza un debate"
select_order: "Ordenar por" select_order: "Ordenar por"
orders: orders:
@@ -158,7 +158,7 @@ es:
proposals: proposals:
index: index:
title: "Propuestas ciudadanas" title: "Propuestas ciudadanas"
featured_proposals_html: "Propuestas<br>destacadas" featured_proposals: "Destacadas"
start_proposal: "Crea una propuesta" start_proposal: "Crea una propuesta"
select_order_long: "Estas viendo las propuestas" select_order_long: "Estas viendo las propuestas"
select_order: "Ordenar por" select_order: "Ordenar por"