diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 44b450779..a0844d6b2 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -303,6 +303,10 @@ a { float: left; } +.back:not([class^="icon-"]) { + text-decoration: underline; +} + .tabs-content { border: 0; } diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 8b7390191..21160f7e9 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1549,18 +1549,8 @@ // 08. Polls // ---------------------- -.dark-heading { - background: #2d3e50; - color: #fff; - - .title { - color: #92ba48; - } - - .button { - background: #fff; - color: $brand; - } +.polls-show-header { + background: #fafafa; .callout { @@ -1576,29 +1566,6 @@ color: $color-alert; } } - - .info { - background: #314253; - padding: $line-height; - - @include breakpoint(medium) { - border-top: rem-calc(6) solid #92ba48; - } - } - - a:not(.button) { - color: #fff; - text-decoration: underline; - } - - .back, - .icon-angle-left { - color: #fff; - } - - &.polls-show-header { - min-height: $line-height * 8; - } } .poll, diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 6895397de..04dce1d40 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -1,10 +1,10 @@ <% provide :title do %><%= @poll.name %><% end %>
-
+
- <%= back_link_to polls_path %> + <%= back_link_to polls_path, t("polls.show.back") %>

<%= @poll.name %>

    @@ -12,25 +12,22 @@
  • <%= g.name %>
  • <% end %>
+
- <%= render "callout" %> -
-
-
-

- - <%= t("polls.show.dates_title") %> - -
- <%= poll_dates(@poll) %> -

-
-
+
+ <%= render "callout" %> + <% if @poll.voted_in_booth?(current_user) %>
<%= t("polls.show.already_voted_in_booth") %> @@ -41,13 +38,5 @@ <% end %> <% end %>
- -
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index ff8a77014..5042eedb8 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -482,7 +482,7 @@ en: help_text_2: "To participate in the next vote you have to sign up on %{org} and verify your account. All registered voters in the city over 16 years old can vote. The results of all votes are binding on the government." show: already_voted_in_booth: "You have already participated in a booth for this poll." - dates_title: "Participation dates" + back: Back to voting cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate." signin: Sign in signup: Sign up @@ -607,6 +607,7 @@ en: budget: Participatory budget searcher: Searcher go_to_page: "Go to page of " + share: Share social: blog: "%{org} Blog" facebook: "%{org} Facebook" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index aaa59a900..e984f6675 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -482,7 +482,7 @@ es: help_text_2: "Para participar en la próxima votación tienes que registrarte en %{org} y verificar tu cuenta. Pueden votar todas las personas empadronadas en la ciudad mayores de 16 años. Los resultados de todas las votaciones serán vinculantes para el gobierno." show: already_voted_in_booth: "Ya has participado en esta votación en una urna." - dates_title: "Fechas de participación" + back: Volver a votaciones cant_answer_not_logged_in: "Necesitas %{signin} o %{signup} para participar." signin: iniciar sesión signup: registrarte @@ -607,6 +607,7 @@ es: budget: Presupuestos participativos searcher: Buscador go_to_page: "Ir a la página de " + share: Compartir social: blog: "Blog de %{org}" facebook: "Facebook de %{org}"