diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-27 16:26:04 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-27 16:26:04 +0000 |
| commit | 0599ced165b45ef10051c1e74d093846b6298103 (patch) | |
| tree | 2f51f8b96f65e84bc01ddc207b32233e8f619b8f /app/views | |
| parent | 46dfee555f9b9144d07735343ff56c87291b7efa (diff) | |
| parent | 4feefd36463b494dc0d9f80138a6c6fcc1e7337a (diff) | |
| download | gitlab-ce-0599ced165b45ef10051c1e74d093846b6298103.tar.gz | |
Merge branch 'rss-btn-alignment-fix' into 'master'
Fixed alignment of RSS button on activity pages
Closes #28572
See merge request !9478
Diffstat (limited to 'app/views')
| -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 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/dashboard/_activities.html.haml b/app/views/dashboard/_activities.html.haml index dc76599b776..0dbb0ca6958 100644 --- a/app/views/dashboard/_activities.html.haml +++ b/app/views/dashboard/_activities.html.haml @@ -4,7 +4,7 @@ .nav-block - if current_user .controls - = link_to dashboard_projects_path(:atom, { private_token: current_user.private_token }), class: 'btn rss-btn' do + = link_to dashboard_projects_path(:atom, { private_token: current_user.private_token }), class: 'btn rss-btn has-tooltip', title: 'Subscribe' do %i.fa.fa-rss = render 'shared/event_filter' diff --git a/app/views/groups/_activities.html.haml b/app/views/groups/_activities.html.haml index 71cc4d87b1f..c442cf056c3 100644 --- a/app/views/groups/_activities.html.haml +++ b/app/views/groups/_activities.html.haml @@ -4,7 +4,7 @@ .nav-block - if current_user .controls - = link_to group_path(@group, format: :atom, private_token: current_user.private_token), class: 'btn rss-btn' do + = link_to group_path(@group, format: :atom, private_token: current_user.private_token), class: 'btn rss-btn has-tooltip' , title: 'Subscribe' do %i.fa.fa-rss = render 'shared/event_filter' diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml index 0ea733cb978..4268337fd6d 100644 --- a/app/views/projects/_activity.html.haml +++ b/app/views/projects/_activity.html.haml @@ -4,7 +4,7 @@ .nav-block.activity-filter-block - if current_user .controls - = link_to namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), title: "Feed", class: 'btn rss-btn' do + = link_to namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), title: "Subscribe", class: 'btn rss-btn has-tooltip' do = icon('rss') = render 'shared/event_filter' |