BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
5d8b06d2
Commit
5d8b06d2
authored
Jan 16, 2018
by
Simon Knox
Committed by
Fatih Acet
Jan 16, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Icons on forks page are to big"
parent
0f449ecc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
index.html.haml
app/views/projects/forks/index.html.haml
+2
-2
_project.html.haml
app/views/shared/projects/_project.html.haml
+1
-1
42046-fork-icon.yml
changelogs/unreleased/42046-fork-icon.yml
+5
-0
No files found.
app/views/projects/forks/index.html.haml
View file @
5d8b06d2
...
@@ -31,11 +31,11 @@
...
@@ -31,11 +31,11 @@
-
if
current_user
&&
can?
(
current_user
,
:fork_project
,
@project
)
-
if
current_user
&&
can?
(
current_user
,
:fork_project
,
@project
)
-
if
current_user
.
already_forked?
(
@project
)
&&
current_user
.
manageable_namespaces
.
size
<
2
-
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
=
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'
)
=
sprite_icon
(
'fork'
,
size:
12
)
%span
Fork
%span
Fork
-
else
-
else
=
link_to
new_project_fork_path
(
@project
),
title:
"Fork project"
,
class:
'btn btn-new'
do
=
link_to
new_project_fork_path
(
@project
),
title:
"Fork project"
,
class:
'btn btn-new'
do
=
custom_icon
(
'icon_fork'
)
=
sprite_icon
(
'fork'
,
size:
12
)
%span
Fork
%span
Fork
...
...
app/views/shared/projects/_project.html.haml
View file @
5d8b06d2
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
=
render_project_pipeline_status
(
project
.
pipeline_status
)
=
render_project_pipeline_status
(
project
.
pipeline_status
)
-
if
forks
-
if
forks
%span
.prepend-left-10
%span
.prepend-left-10
=
sprite_icon
(
'fork'
)
=
sprite_icon
(
'fork'
,
size:
12
)
=
number_with_delimiter
(
project
.
forks_count
)
=
number_with_delimiter
(
project
.
forks_count
)
-
if
stars
-
if
stars
%span
.prepend-left-10
%span
.prepend-left-10
...
...
changelogs/unreleased/42046-fork-icon.yml
0 → 100644
View file @
5d8b06d2
---
title
:
Fix giant fork icons on forks page
merge_request
:
16474
author
:
type
:
fixed
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