Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
4feefd36
Commit
4feefd36
authored
Feb 23, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed alignment of RSS button on activity pages
Added a tooltip to the buttons that did not have any Closes #28572
parent
fae2650c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
12 deletions
+8
-12
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+1
-1
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+0
-8
app/views/dashboard/_activities.html.haml
app/views/dashboard/_activities.html.haml
+1
-1
app/views/groups/_activities.html.haml
app/views/groups/_activities.html.haml
+1
-1
app/views/projects/_activity.html.haml
app/views/projects/_activity.html.haml
+1
-1
changelogs/unreleased/rss-btn-alignment-fix.yml
changelogs/unreleased/rss-btn-alignment-fix.yml
+4
-0
No files found.
app/assets/stylesheets/framework/blocks.scss
View file @
4feefd36
...
@@ -229,7 +229,7 @@
...
@@ -229,7 +229,7 @@
.controls
{
.controls
{
float
:
right
;
float
:
right
;
margin-top
:
8px
;
margin-top
:
8px
;
padding-bottom
:
7
px
;
padding-bottom
:
8
px
;
border-bottom
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
}
}
}
}
...
...
app/assets/stylesheets/pages/projects.scss
View file @
4feefd36
...
@@ -638,14 +638,6 @@ pre.light-well {
...
@@ -638,14 +638,6 @@ pre.light-well {
margin
:
0
;
margin
:
0
;
}
}
.activity-filter-block
{
.controls
{
padding-bottom
:
7px
;
margin-top
:
8px
;
border-bottom
:
1px
solid
$border-color
;
}
}
.commits-search-form
{
.commits-search-form
{
.input-short
{
.input-short
{
min-width
:
200px
;
min-width
:
200px
;
...
...
app/views/dashboard/_activities.html.haml
View file @
4feefd36
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
.nav-block
.nav-block
-
if
current_user
-
if
current_user
.controls
.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
%i
.fa.fa-rss
=
render
'shared/event_filter'
=
render
'shared/event_filter'
...
...
app/views/groups/_activities.html.haml
View file @
4feefd36
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
.nav-block
.nav-block
-
if
current_user
-
if
current_user
.controls
.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
%i
.fa.fa-rss
=
render
'shared/event_filter'
=
render
'shared/event_filter'
...
...
app/views/projects/_activity.html.haml
View file @
4feefd36
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
.nav-block.activity-filter-block
.nav-block.activity-filter-block
-
if
current_user
-
if
current_user
.controls
.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'
)
=
icon
(
'rss'
)
=
render
'shared/event_filter'
=
render
'shared/event_filter'
...
...
changelogs/unreleased/rss-btn-alignment-fix.yml
0 → 100644
View file @
4feefd36
---
title
:
Fixed RSS button alignment on activity pages
merge_request
:
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment