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
Léo-Paul Géneau
gitlab-ce
Commits
13c62cdb
Commit
13c62cdb
authored
Jul 15, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add svg icon color to btn-color mixin
parent
5aea280f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
10 deletions
+19
-10
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+6
-8
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+11
-0
app/views/projects/buttons/_fork.html.haml
app/views/projects/buttons/_fork.html.haml
+2
-2
No files found.
app/assets/stylesheets/framework/buttons.scss
View file @
13c62cdb
...
...
@@ -51,16 +51,13 @@
}
svg
{
vertical-align
:
top
;
position
:
relative
;
top
:
2px
;
path
{
fill
:
$
white-light
;
fill
:
$
color
;
}
use
{
stroke
:
$
white-light
;
stroke
:
$
color
;
}
}
}
...
...
@@ -189,9 +186,10 @@
}
svg
{
width
:
16px
;
height
:
auto
;
vertical-align
:
middle
;
height
:
15px
;
width
:
auto
;
position
:
relative
;
top
:
2px
;
}
}
...
...
app/assets/stylesheets/pages/projects.scss
View file @
13c62cdb
...
...
@@ -129,6 +129,17 @@
color
:
$layout-link-gray
;
}
svg
{
path
{
fill
:
$layout-link-gray
;
}
use
{
stroke
:
$layout-link-gray
;
}
}
.fa-caret-down
{
margin-left
:
3px
;
}
...
...
app/views/projects/buttons/_fork.html.haml
View file @
13c62cdb
...
...
@@ -2,7 +2,7 @@
-
if
current_user
&&
can?
(
current_user
,
:fork_project
,
@project
)
-
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
=
icon
(
'code-fork fw
'
)
=
custom_icon
(
'icon_fork
'
)
Fork
%div
.count-with-arrow
%span
.arrow
...
...
@@ -10,7 +10,7 @@
=
@project
.
forks_count
-
else
=
link_to
new_namespace_project_fork_path
(
@project
.
namespace
,
@project
),
title:
"Fork project"
,
class:
'btn has-tooltip'
do
=
icon
(
'code-fork fw
'
)
=
custom_icon
(
'icon_fork
'
)
Fork
%div
.count-with-arrow
%span
.arrow
...
...
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