diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index a31978cee..c578b63ac 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -444,6 +444,7 @@ } blockquote { + clear: both; color: #4c4c4c; margin-top: rem-calc(12); padding-top: 0; diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index 4515fa2e5..a83da2fc5 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -71,11 +71,13 @@ <% end %> -
-
- <%= render "view_mode" %> + <% unless params[:selected].present? %> +
+
+ <%= render "view_mode" %> +
-
+ <% end %> <% unless params[:retired].present? || params[:selected].present? %> <%= render "shared/advanced_search", diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 42b764a31..7e329683d 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -100,6 +100,15 @@ describe "Proposals" do end end + scenario "Index view mode is not shown with selected filter" do + visit proposals_path + + click_link "View selected proposals" + + expect(page).not_to have_selector(".view-mode") + expect(page).not_to have_button("View mode") + end + scenario "Pagination" do per_page = Kaminari.config.default_per_page (per_page + 5).times { create(:proposal) }