diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 67abd0f1f..44b450779 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -354,6 +354,18 @@ a {
vertical-align: top;
}
+.aling-middle {
+ vertical-align: middle;
+}
+
+.table {
+ display: table;
+}
+
+.table-cell {
+ display: table-cell;
+}
+
// 02. Header
// ----------
diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index fbcda0ebb..719a8b229 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -1701,9 +1701,13 @@
}
.section-title-divider {
- border-bottom: 2px solid $brand;
- color: $brand;
- margin-bottom: $line-height;
+ border-bottom: 1px solid #eee;
+ color: #000;
+ margin: $line-height 0;
+
+ span {
+ border-bottom: 1px solid #000;
+ }
}
.poll-question {
diff --git a/app/views/polls/_poll_group.html.erb b/app/views/polls/_poll_group.html.erb
index e3e5c5976..9372aee17 100644
--- a/app/views/polls/_poll_group.html.erb
+++ b/app/views/polls/_poll_group.html.erb
@@ -33,23 +33,30 @@
<%= t("polls.index.cant_answer") %>
<% end %>
-
-
-
<%= poll_dates(poll) %>
+
+
+
+
<% if poll.questions.count == 1 %>
<% poll.questions.each do |question| %>
-
<%= link_to question.title, poll %>
+
<%= link_to question.title, poll %>
+ <%= poll_dates(poll) %>
<% end %>
<% else %>
-
<%= link_to poll.name, poll %>
-
-
- <%= link_to poll, class: "button expanded" do %>
- <% if poll.expired? %>
- <%= t("polls.index.participate_button_expired") %>
- <% elsif poll.incoming? %>
- <%= t("polls.index.participate_button_incoming") %>
- <% else %>
- <%= t("polls.index.participate_button") %>
+
+
+ <%= link_to poll, class: "button hollow expanded" do %>
+ <% if poll.expired? %>
+ <%= t("polls.index.participate_button_expired") %>
+ <% elsif poll.incoming? %>
+ <%= t("polls.index.participate_button_incoming") %>
+ <% else %>
+ <%= t("polls.index.participate_button") %>
+ <% end %>
<% end %>
- <% end %>
+
diff --git a/app/views/polls/index.html.erb b/app/views/polls/index.html.erb
index 871b04953..6877cd31d 100644
--- a/app/views/polls/index.html.erb
+++ b/app/views/polls/index.html.erb
@@ -6,18 +6,22 @@
<%= render "shared/section_header", i18n_namespace: "polls.index.section_header", image: "polls" %>
-
+
<%= render 'shared/filter_subnav', i18n_namespace: "polls.index" %>
<% polls_by_geozone_restriction = @polls.group_by(&:geozone_restricted) %>
<% if polls_by_geozone_restriction[false].present? %>
-
<%= t("polls.index.no_geozone_restricted") %>
+
+ <%= t("polls.index.no_geozone_restricted") %>
+
<%= render partial: 'poll_group', locals: {poll_group: polls_by_geozone_restriction[false]} %>
<% end %>
<% if polls_by_geozone_restriction[true].present? %>
- <%= t("polls.index.geozone_restricted") %>
+
+ <%= t("polls.index.geozone_restricted") %>
+
<%= render partial: 'poll_group', locals: {poll_group: polls_by_geozone_restriction[true]} %>
<% end %>