diff --git a/app/assets/stylesheets/widgets/feeds/participation.scss b/app/assets/stylesheets/widgets/feeds/participation.scss new file mode 100644 index 000000000..72a45a955 --- /dev/null +++ b/app/assets/stylesheets/widgets/feeds/participation.scss @@ -0,0 +1,20 @@ +.feeds-participation { + + .feed-debates, + .feed-proposals { + @include grid-col; + margin-top: $line-height; + } + + .feed-proposals:not(:only-child) { + @include breakpoint(medium) { + width: 2 * 100% / 3; + } + } + + .feed-debates:not(:only-child) { + @include breakpoint(medium) { + width: 1 * 100% / 3; + } + } +} diff --git a/app/components/widgets/feeds/debates_component.html.erb b/app/components/widgets/feeds/debates_component.html.erb index 2f8ad552f..c49770f41 100644 --- a/app/components/widgets/feeds/debates_component.html.erb +++ b/app/components/widgets/feeds/debates_component.html.erb @@ -1,5 +1,4 @@ -
"> +

<%= t("welcome.feed.most_active.#{feed.kind}") %>

diff --git a/app/components/widgets/feeds/debates_component.rb b/app/components/widgets/feeds/debates_component.rb index fd3bcd18b..cdee45cbd 100644 --- a/app/components/widgets/feeds/debates_component.rb +++ b/app/components/widgets/feeds/debates_component.rb @@ -1,5 +1,4 @@ class Widgets::Feeds::DebatesComponent < ApplicationComponent - include FeedsHelper attr_reader :feed def initialize(feed) diff --git a/app/components/widgets/feeds/proposals_component.html.erb b/app/components/widgets/feeds/proposals_component.html.erb index 18fba01e0..14d9a0765 100644 --- a/app/components/widgets/feeds/proposals_component.html.erb +++ b/app/components/widgets/feeds/proposals_component.html.erb @@ -1,5 +1,4 @@ -
"> +

<%= t("welcome.feed.most_active.#{feed.kind}") %>

diff --git a/app/components/widgets/feeds/proposals_component.rb b/app/components/widgets/feeds/proposals_component.rb index 47f806b5f..d799c5516 100644 --- a/app/components/widgets/feeds/proposals_component.rb +++ b/app/components/widgets/feeds/proposals_component.rb @@ -1,5 +1,4 @@ class Widgets::Feeds::ProposalsComponent < ApplicationComponent - include FeedsHelper attr_reader :feed def initialize(feed) diff --git a/app/helpers/feeds_helper.rb b/app/helpers/feeds_helper.rb index b5bf5a0c1..d9bcb9aea 100644 --- a/app/helpers/feeds_helper.rb +++ b/app/helpers/feeds_helper.rb @@ -3,19 +3,7 @@ module FeedsHelper feed.kind == "processes" end - def feed_debates_enabled? - Setting["homepage.widgets.feeds.debates"].present? - end - - def feed_proposals_enabled? - Setting["homepage.widgets.feeds.proposals"].present? - end - def feed_processes_enabled? Setting["homepage.widgets.feeds.processes"].present? end - - def feed_debates_and_proposals_enabled? - feed_debates_enabled? && feed_proposals_enabled? - end end diff --git a/spec/system/admin/homepage/homepage_spec.rb b/spec/system/admin/homepage/homepage_spec.rb index 0e3eff79a..a47793d1f 100644 --- a/spec/system/admin/homepage/homepage_spec.rb +++ b/spec/system/admin/homepage/homepage_spec.rb @@ -92,9 +92,6 @@ describe "Homepage", :admin do expect(page).to have_content "Most active debates" expect(page).to have_css(".debate", count: 3) end - - expect(page).to have_css("#feed_proposals.medium-8") - expect(page).to have_css("#feed_debates.medium-4") end scenario "Processes", :js do