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
Boxiang Sun
gitlab-ce
Commits
5aea280f
Commit
5aea280f
authored
Jul 14, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add new fork svg icon
parent
877c77cc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
2 deletions
+23
-2
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+20
-0
app/views/projects/forks/index.html.haml
app/views/projects/forks/index.html.haml
+2
-2
app/views/shared/icons/_icon_fork.svg
app/views/shared/icons/_icon_fork.svg
+1
-0
No files found.
app/assets/stylesheets/framework/buttons.scss
View file @
5aea280f
...
@@ -49,6 +49,20 @@
...
@@ -49,6 +49,20 @@
border-color
:
$border-dark
;
border-color
:
$border-dark
;
color
:
$color
;
color
:
$color
;
}
}
svg
{
vertical-align
:
top
;
position
:
relative
;
top
:
2px
;
path
{
fill
:
$white-light
;
}
use
{
stroke
:
$white-light
;
}
}
}
}
@mixin
btn-green
{
@mixin
btn-green
{
...
@@ -173,6 +187,12 @@
...
@@ -173,6 +187,12 @@
.caret
{
.caret
{
margin-left
:
5px
;
margin-left
:
5px
;
}
}
svg
{
width
:
16px
;
height
:
auto
;
vertical-align
:
middle
;
}
}
}
.btn-lg
{
.btn-lg
{
...
...
app/views/projects/forks/index.html.haml
View file @
5aea280f
...
@@ -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
=
icon
(
'code-fork fw
'
)
=
custom_icon
(
'icon_fork
'
)
Fork
Fork
-
else
-
else
=
link_to
new_namespace_project_fork_path
(
@project
.
namespace
,
@project
),
title:
"Fork project"
,
class:
'btn btn-new'
do
=
link_to
new_namespace_project_fork_path
(
@project
.
namespace
,
@project
),
title:
"Fork project"
,
class:
'btn btn-new'
do
=
icon
(
'code-fork fw
'
)
=
custom_icon
(
'icon_fork
'
)
Fork
Fork
...
...
app/views/shared/icons/_icon_fork.svg
0 → 100644
View file @
5aea280f
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"40"
height=
"40"
viewBox=
"0 0 40 40"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
><defs><circle
id=
"a"
cx=
"4"
cy=
"4"
r=
"4"
/><mask
id=
"d"
width=
"8"
height=
"8"
x=
"0"
y=
"0"
fill=
"#fff"
><use
xlink:href=
"#a"
/></mask><circle
id=
"b"
cx=
"20"
cy=
"4"
r=
"4"
/><mask
id=
"e"
width=
"8"
height=
"8"
x=
"0"
y=
"0"
fill=
"#fff"
><use
xlink:href=
"#b"
/></mask><circle
id=
"c"
cx=
"12"
cy=
"30"
r=
"4"
/><mask
id=
"f"
width=
"8"
height=
"8"
x=
"0"
y=
"0"
fill=
"#fff"
><use
xlink:href=
"#c"
/></mask></defs><g
fill=
"none"
fill-rule=
"evenodd"
transform=
"translate(8 3)"
><path
fill=
"#7E7E7E"
d=
"M10 19.667c-4.14-1.29-7.389-5.878-7.389-5.878C2.274 13.353 2 12.545 2 12.01V6h4v5.509c0 .276.166.65.367.831 0 0 1.136 1.028 1.746 1.574C9.617 15.261 11.048 16 12.09 16c1.028 0 2.41-.723 3.858-2.048.588-.54 1.84-1.742 1.84-1.742a.784.784 0 0 0 .211-.502V6h4v6.008c0 .548-.259 1.349-.601 1.795 0 0-3.21 4.707-7.399 5.916V27h-4v-7.333z"
/><use
stroke=
"#7E7E7E"
stroke-width=
"4"
mask=
"url(#d)"
xlink:href=
"#a"
/><use
stroke=
"#7E7E7E"
stroke-width=
"4"
mask=
"url(#e)"
xlink:href=
"#b"
/><use
stroke=
"#7E7E7E"
stroke-width=
"4"
mask=
"url(#f)"
xlink:href=
"#c"
/></g></svg>
\ No newline at end of file
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