kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed alignment of RSS button on activity pages 

Added a tooltip to the buttons that did not have any

Closes #28572
This commit is contained in:
Phil Hughes 2017-02-23 16:21:41 +00:00
parent fae2650cbc
commit 4feefd3646
6 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/framework/blocks.scss
View File

@ -229,7 +229,7 @@
.controls {
float: right;
margin-top: 8px;
padding-bottom: 7px;
padding-bottom: 8px;
border-bottom: 1px solid $border-color;
}
}

8
app/assets/stylesheets/pages/projects.scss
View File

@ -638,14 +638,6 @@ pre.light-well {
margin: 0;
}
.activity-filter-block {
.controls {
padding-bottom: 7px;
margin-top: 8px;
border-bottom: 1px solid $border-color;
}
}
.commits-search-form {
.input-short {
min-width: 200px;

2
app/views/dashboard/_activities.html.haml
View File

@ -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'

2
app/views/groups/_activities.html.haml
View File

@ -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'

2
app/views/projects/_activity.html.haml
View File

@ -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'

4
changelogs/unreleased/rss-btn-alignment-fix.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Fixed RSS button alignment on activity pages
merge_request:
author: