diff options
| author | Kushal Pandya <kushal@gitlab.com> | 2018-07-11 15:28:23 +0530 |
|---|---|---|
| committer | Kushal Pandya <kushal@gitlab.com> | 2018-07-13 12:32:07 +0530 |
| commit | 37737b5fe8bf3cbe9376da6bdad1a1f1a7cb5f70 (patch) | |
| tree | 5f4a5c1ad276171ef364491d683ddc34dd2701f9 | |
| parent | 924146a8d6b158fda1f9cddbdcd8ce957b6baec9 (diff) | |
| download | gitlab-ce-37737b5fe8bf3cbe9376da6bdad1a1f1a7cb5f70.tar.gz | |
Update `.controls` positioning
| -rw-r--r-- | app/views/dashboard/_activities.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/_activities.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/_activity.html.haml | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/app/views/dashboard/_activities.html.haml b/app/views/dashboard/_activities.html.haml index a676eba2aee..9c246e19faa 100644 --- a/app/views/dashboard/_activities.html.haml +++ b/app/views/dashboard/_activities.html.haml @@ -1,8 +1,8 @@ .nav-block.activities + = render 'shared/event_filter' .controls = link_to dashboard_projects_path(rss_url_options), class: 'btn rss-btn has-tooltip', title: 'Subscribe' do %i.fa.fa-rss - = render 'shared/event_filter' .content_list = spinner diff --git a/app/views/groups/_activities.html.haml b/app/views/groups/_activities.html.haml index 577c63503a8..82a497289f3 100644 --- a/app/views/groups/_activities.html.haml +++ b/app/views/groups/_activities.html.haml @@ -1,8 +1,8 @@ .nav-block.activities + = render 'shared/event_filter' .controls = link_to group_path(@group, rss_url_options), class: 'btn rss-btn has-tooltip' , title: 'Subscribe' do %i.fa.fa-rss - = render 'shared/event_filter' .content_list = spinner diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml index 1f701f2aa1b..6bf21570d41 100644 --- a/app/views/projects/_activity.html.haml +++ b/app/views/projects/_activity.html.haml @@ -1,10 +1,9 @@ %div{ class: container_class } .nav-block.activity-filter-block.activities + = render 'shared/event_filter' .controls = link_to project_path(@project, rss_url_options), title: s_("ProjectActivityRSS|Subscribe"), class: 'btn rss-btn has-tooltip' do = icon('rss') - = render 'shared/event_filter' - .content_list.project-activity{ :"data-href" => activity_project_path(@project) } = spinner |