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
8086526c
Commit
8086526c
authored
Aug 19, 2016
by
winniehell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix alignment of icon buttons (!5887)
parent
12fe6a6f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
5 deletions
+8
-5
CHANGELOG
CHANGELOG
+1
-0
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+3
-1
app/views/projects/buttons/_fork.html.haml
app/views/projects/buttons/_fork.html.haml
+2
-2
app/views/projects/forks/index.html.haml
app/views/projects/forks/index.html.haml
+2
-2
No files found.
CHANGELOG
View file @
8086526c
...
...
@@ -52,6 +52,7 @@ v 8.11.0 (unreleased)
- Get issue and merge request description templates from repositories
- Add hover state to todos !5361 (winniehell)
- Fix icon alignment of star and fork buttons !5451 (winniehell)
- Fix alignment of icon buttons !5887 (winniehell)
- Enforce 2FA restrictions on API authentication endpoints !5820
- Limit git rev-list output count to one in forced push check
- Show deployment status on merge requests with external URLs
...
...
app/assets/stylesheets/framework/buttons.scss
View file @
8086526c
...
...
@@ -206,7 +206,9 @@
}
svg
,
.fa
{
margin-right
:
3px
;
&
:not
(
:last-child
)
{
margin-right
:
3px
;
}
}
}
...
...
app/views/projects/buttons/_fork.html.haml
View file @
8086526c
...
...
@@ -3,11 +3,11 @@
-
if
current_user
.
already_forked?
(
@project
)
&&
current_user
.
manageable_namespaces
.
size
<
2
=
link_to
namespace_project_path
(
current_user
,
current_user
.
fork_of
(
@project
)),
title:
'Go to your fork'
,
class:
'btn has-tooltip'
do
=
custom_icon
(
'icon_fork'
)
Fork
%span
Fork
-
else
=
link_to
new_namespace_project_fork_path
(
@project
.
namespace
,
@project
),
title:
"Fork project"
,
class:
'btn has-tooltip'
do
=
custom_icon
(
'icon_fork'
)
Fork
%span
Fork
%div
.count-with-arrow
%span
.arrow
=
link_to
namespace_project_forks_path
(
@project
.
namespace
,
@project
),
class:
"count"
do
...
...
app/views/projects/forks/index.html.haml
View file @
8086526c
...
...
@@ -32,11 +32,11 @@
-
if
current_user
.
already_forked?
(
@project
)
&&
current_user
.
manageable_namespaces
.
size
<
2
=
link_to
namespace_project_path
(
current_user
,
current_user
.
fork_of
(
@project
)),
title:
'Go to your fork'
,
class:
'btn btn-new'
do
=
custom_icon
(
'icon_fork'
)
Fork
%span
Fork
-
else
=
link_to
new_namespace_project_fork_path
(
@project
.
namespace
,
@project
),
title:
"Fork project"
,
class:
'btn btn-new'
do
=
custom_icon
(
'icon_fork'
)
Fork
%span
Fork
=
render
'projects'
,
projects:
@forks
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