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

Merge pull request #3259 from Platoniq/dashboard-fix-counter-design

Browse Source 
Dashboard fix counter design
This commit is contained in:
Alberto
2019-03-19 16:20:28 +01:00
committed by GitHub
parent 087faa15e8 5c6abce8ee
commit f9586bc97c
3 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/stylesheets/dashboard.scss
View File

@@ -31,19 +31,31 @@
border-radius: rem-calc(6);
margin-bottom: $line-height;
padding: $line-height / 2;
text-align: center;
.counter {
text-align: center;
@include breakpoint(medium only) {
.change-behaviour {
float: left;
margin-top: $line-height / 2;
padding: $line-height;
width: 100%;
}
}
.counter-divider {
@include breakpoint(medium) {
border-left: 2px solid $highlight;
}
@include breakpoint(large) {
border-right: 2px solid $highlight;
}
}
.supports .counter-label {
display: block;
}
.counter-value {
font-size: rem-calc(20);
font-weight: bold;
@@ -57,7 +69,7 @@
.progress {
background: #f0efea;
border-radius: rem-calc(6);
height: $line-height;
height: $line-height / 2;
}
.progress-meter {

61
app/views/layouts/dashboard/_proposal_totals.html.erb
View File

@@ -1,6 +1,6 @@
<div class="dashboard-proposals-stats">
<div class="row expanded">
<div class="small-12 medium-3 large-2 column">
<div class="small-12 medium-6 large-2 column">
<div class="counter">
<div class="counter-value">
<%= Dashboard::Action.active.resources.active_for(proposal).count %>
@@ -11,46 +11,51 @@
</div>
</div>
<div class="small-12 medium-3 large-2 column counter-divider">
<div class="small-12 medium-6 large-2 column counter-divider">
<div class="counter">
<div class="counter-value"><%= number_with_delimiter(community_members_count, delimiter: '.') %></div>
<span class="counter-label"><%= t("layouts.dashboard.proposal_totals.community") %></span>
</div>
</div>
<div class="small-12 medium-3 large-2 column">
<div class="counter">
<div class="counter-value">
<%= number_with_delimiter(proposal.votes_for.size, delimiter: '.') %>
/
<%= t("layouts.dashboard.proposal_totals.support_count", count: number_with_delimiter(next_goal_supports, delimiter: '.')) %>
<div class="change-behaviour">
<div class="small-12 medium-6 large-4 column supports">
<div class="counter">
<div class="counter-value">
<%= number_with_delimiter(proposal.votes_for.size, delimiter: '.') %>
/
<%= t("layouts.dashboard.proposal_totals.support_count", count: number_with_delimiter(next_goal_supports, delimiter: '.')).html_safe %>
</div>
<span class="counter-label"><%= t("layouts.dashboard.proposal_totals.current_goal") %></span>
</div>
<div class="next-goal-progress">
<%= next_goal_progress %>%
</div>
<div class="progress" role="progressbar" tabindex="0" aria-valuenow="0" aria-valuemin="0"
aria-valuetext="<%= "#{next_goal_progress}%" %>" aria-valuemax="100">
<div class="progress-meter" style="width: <%= next_goal_progress %>%"></div>
</div>
<span class="counter-label"><%= t("layouts.dashboard.proposal_totals.current_goal") %></span>
</div>
</div>
<div class="small-12 large-6 column">
<div class="row">
<div class="small-12 medium-8 column">
<div class="next-goal-progress">
<%= next_goal_progress %>%
</div>
<div class="progress" role="progressbar" tabindex="0" aria-valuenow="0" aria-valuemin="0"
aria-valuetext="<%= "#{next_goal_progress}%" %>" aria-valuemax="100">
<div class="progress-meter" style="width: <%= next_goal_progress %>%"></div>
</div>
</div>
<div class="small-12 medium-6 large-4 column">
<div class="row">
<div class="small-12 medium-12 column">
<div class="small-12 medium-4 column">
<div class="proposal-link">
<% if proposal.draft? %>
<%= link_to t('layouts.dashboard.proposal_totals.preview_proposal'), proposal_path(proposal), class: 'button success expanded', target: '_blank' %>
<% else %>
<%= link_to t('layouts.dashboard.proposal_totals.show_proposal'), proposal_path(proposal), class: 'button success expanded', target: '_blank' %>
<% end %>
</div>
<div class="small-12 medium-12 column">
<div class="proposal-link">
<% if proposal.draft? %>
<%= link_to t('layouts.dashboard.proposal_totals.preview_proposal'), proposal_path(proposal), class: 'button success expanded', target: '_blank' %>
<% else %>
<%= link_to t('layouts.dashboard.proposal_totals.show_proposal'), proposal_path(proposal), class: 'button success expanded', target: '_blank' %>
<% end %>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

4
config/locales/es/general.yml
View File

@@ -211,8 +211,8 @@ es:
preview_proposal: Previsualizar propuesta
current_goal: Meta actual
support_count:
one: "%{count} apoyo"
other: "%{count} apoyos"
one: "%{count} <span class='counter-label'>Apoyo</span>"
other: "%{count} <span class='counter-label'>Apoyos</span>"
footer:
accessibility: Accesibilidad
conditions: Condiciones de uso