diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index b4ea0cca3..5bd9aedfd 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -1932,6 +1932,36 @@ table { .activity { margin-bottom: $line-height * 2; + .accordion li { + margin-bottom: $line-height / 2; + + .accordion-title { + border-bottom: 1px solid $border; + background: #f8f9fb; + font-size: $small-font-size; + padding: $line-height / 2; + } + + .accordion-content { + padding: 0; + } + } + + .accordion .title { + display: block; + line-height: $line-height; + } + + .accordion .icon { + font-size: rem-calc(20); + float: left; + margin-right: $line-height / 3; + + &.icon-debates { + margin-top: rem-calc(3); + } + } + table { border: 0; } diff --git a/app/views/users/_activity_page.html.erb b/app/views/users/_activity_page.html.erb index df46df76d..455d30f50 100644 --- a/app/views/users/_activity_page.html.erb +++ b/app/views/users/_activity_page.html.erb @@ -1,3 +1,4 @@ +<%= render "following" %> <%= render "proposals" if @proposals.present? %> <%= render "debates" if @debates.present? && feature?(:debates) %> <%= render "budget_investments" if @budget_investments.present? && feature?(:budgets) %> diff --git a/app/views/users/_following.html.erb b/app/views/users/_following.html.erb new file mode 100644 index 000000000..217312177 --- /dev/null +++ b/app/views/users/_following.html.erb @@ -0,0 +1,34 @@ +
|
+ <%= link_to "add translation", nil %>
+ + This is longer content Donec id elit non mi porta gravida at eget metus. + |
+