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

Adds welcome link and styles for proposals show

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2015-09-13 19:07:39 +02:00
parent 9dee1bc8b2
commit 32b299a194
9 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/stylesheets/debates.scss
View File

@@ -487,13 +487,16 @@
font-weight: bold;
}
h3 {
border-top: 2px solid $brand;
display: inline-block;
font-size: rem-calc(16);
margin: -1px 0 rem-calc(12);
padding-top: rem-calc(6);
text-transform: uppercase;
aside {
h3 {
border-top: 2px solid $brand;
display: inline-block;
font-size: rem-calc(16);
margin: -1px 0 rem-calc(12);
padding-top: rem-calc(6);
text-transform: uppercase;
}
}
.votes {

16
app/assets/stylesheets/participacion.scss
View File

@@ -302,13 +302,21 @@ header {
font-size: rem-calc(16);
margin-top: 0;
&.see-more {
&.see-more-debates {
width: 100%;
@media (min-width: $small-breakpoint) {
width: auto;
}
}
&.see-more-proposals {
@extend .see-more-debates;
@media (min-width: $small-breakpoint) {
margin-left: rem-calc(12);
}
}
}
.home-page {
@@ -329,7 +337,7 @@ header {
@media (min-width: $small-breakpoint) {
display: inline-block;
margin-bottom: 0;
margin-left: rem-calc(24);
margin-left: rem-calc(12);
}
&:hover {
@@ -656,7 +664,7 @@ header {
@media (min-width: $small-breakpoint) {
line-height: $line-height*3;
margin-left: rem-calc(12);
margin-right: rem-calc(72);
margin-right: rem-calc(36);
}
&:after {
@@ -772,7 +780,7 @@ footer {
@extend .tags;
h3 {
border-top: 1px solid $votes-border;
border-top: 2px solid $brand;
display: inline-block;
font-family: $font-family-sans-serif;
font-size: rem-calc(16);

25
app/assets/stylesheets/proposals.scss
View File

@@ -75,6 +75,7 @@
// }
.total-supports {
color: $proposals;
float: right;
font-size: rem-calc(14);
@@ -342,7 +343,6 @@
// }
.total-supports {
color: $proposals;
display: inline-block;
line-height: $line-height;
margin-left: rem-calc(24);
@@ -456,13 +456,16 @@
font-weight: bold;
}
h3 {
border-top: 2px solid $brand;
display: inline-block;
font-size: rem-calc(16);
margin: -1px 0 rem-calc(12);
padding-top: rem-calc(6);
text-transform: uppercase;
aside {
h3 {
border-top: 2px solid $brand;
display: inline-block;
font-size: rem-calc(16);
margin: -1px 0 rem-calc(12);
padding-top: rem-calc(6);
text-transform: uppercase;
}
}
.supports {
@@ -539,8 +542,8 @@
}
.icon-proposals {
color: $debates;
font-size: rem-calc(60);
color: $proposals;
font-size: rem-calc(50);
line-height: $line-height;
opacity: .5;
}
@@ -563,7 +566,7 @@
margin: rem-calc(12) 0;
&:before {
color: $debates;
color: $proposals;
content: "l ";
font-family: "icons" !important;
}

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

@@ -24,7 +24,7 @@
</div>
<% if @tag_filter || @search_terms %>
<div class="small-12 inline-block medium-5 margin-top inline-block debates-order">
<div class="small-12 medium-5 margin-top inline-block debates-order">
<h6 class="inline-block">
<%= t("debates.index.select_order") %>
</h6>

9
app/views/layouts/_header.html.erb
View File

@@ -31,9 +31,10 @@
<div class="row-full subnavigation-container">
<section class="subnavigation row">
<%#= link_to t("layouts.header.welcome"), root_path %>
<%#= link_to t("layouts.header.initiatives"), "#" %>
<div class="small-12 medium-8 column">
<% if user_signed_in? %>
<%= link_to t("layouts.header.welcome"), root_path, class: ("active" if current_page? root_path) %>
<% end %>
<%= link_to t("layouts.header.debates"), debates_path, class: ("active" if current_page?(controller: "/debates")) %>
<%= link_to t("layouts.header.proposals"), proposals_path, class: ("active" if current_page?(controller: "/proposals")) %>
<%= link_to t("layouts.header.more_information"), "/more_information", class: ("active" if current_page?("/more_information")) %>
@@ -53,8 +54,8 @@
<div class="small-12 medium-7 column">
<h1><%= t("layouts.header.open_city_title") %></h1>
<p><%= t("layouts.header.open_city_slogan") %></p>
<%= link_to t("layouts.header.see_all_debates"), debates_path, class: "button radius see-more" %>
<%= link_to t("layouts.header.see_all_proposals"), proposals_path, class: "button radius see-more" %>
<%= link_to t("layouts.header.see_all_debates"), debates_path, class: "button radius see-more-debates" %>
<%= link_to t("layouts.header.see_all_proposals"), proposals_path, class: "button radius see-more-proposals" %>
<%= link_to t("layouts.header.more_information"), "/more_information", class: "more-info" %>
</div>

4
app/views/proposals/_votes.html.erb
View File

@@ -1,7 +1,7 @@
<% voted_classes = css_classes_for_proposal_vote(@proposal_votes, proposal) %>
<div class="supports">
<div class="progress small-12 radius">
<div class="progress small-12 round">
<span class="meter" style="width: <%= progress_bar_percentage(proposal) %>%;"></span>
</div>
@@ -10,7 +10,7 @@
</span>
<%= link_to vote_proposal_path(proposal, value: 'yes'), class: "button button-support tiny radius expand #{voted_classes[:in_favor]}",
title: t('proposals.proposal.support'), method: "post", remote: true do %>
title: t('proposals.proposal.support_title'), method: "post", remote: true do %>
<%= t("proposals.proposal.support") %>
<% end %>

6
app/views/proposals/index.html.erb
View File

@@ -9,7 +9,7 @@
<div id="proposals" class="proposals-list small-12 medium-9 column">
<div class="filters">
<div class="small-12 medium-7 column">
<div class="small-12 medium-7 left">
<% if @search_terms %>
<h2 class="margin-top">
<%= page_entries_info @proposals %>
@@ -24,14 +24,14 @@
</div>
<% if @tag_filter || @search_terms %>
<div class="small-12 medium-5 margin-top inline-block proposals-order">
<div class="small-12 medium-5 margin-top margin-top inline-block proposals-order">
<h6 class="inline-block">
<%= t("proposals.index.select_order") %>
</h6>
<%= render 'shared/order_selector', i18n_namespace: "proposals.index" %>
</div>
<% else %>
<div class="small-12 column margin-top inline-block">
<div class="small-12 inline-block">
<h2 class="inline-block">
<%= t("proposals.index.select_order_long") %>
</h2>

3
config/locales/en.yml
View File

@@ -26,7 +26,7 @@ en:
locale: "Language:"
administration: Administration
moderation: Moderation
# welcome: Welcome
welcome: "Welcome"
more_information: "More information"
debates: Debates
proposals: Proposals
@@ -159,6 +159,7 @@ en:
proposal:
proposal: Proposal
support: "Support"
support_title: "Support this proposal"
comments:
zero: No comments
one: 1 Comment

3
config/locales/es.yml
View File

@@ -26,7 +26,7 @@ es:
locale: "Idioma:"
administration: Administrar
moderation: Moderar
# welcome: Portada
welcome: "Portada"
more_information: "Más información"
debates: Debates
proposals: Propuestas ciudadanas
@@ -159,6 +159,7 @@ es:
proposal:
proposal: Propuesta
support: "Apoyar"
support_title: "Apoyar esta propuesta"
comments:
zero: Sin comentarios
one: 1 Comentario