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
8e7f84b5
Commit
8e7f84b5
authored
Nov 14, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated to use new sprite icons
parent
04fcc7da
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+2
-0
app/helpers/diff_helper.rb
app/helpers/diff_helper.rb
+3
-3
app/views/projects/diffs/_stats.html.haml
app/views/projects/diffs/_stats.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/common.scss
View file @
8e7f84b5
...
...
@@ -2,7 +2,9 @@
.cgray
{
color
:
$common-gray
;
}
.clgray
{
color
:
$common-gray-light
;
}
.cred
{
color
:
$common-red
;
}
svg
.cred
{
fill
:
$common-red
;
}
.cgreen
{
color
:
$common-green
;
}
svg
.cgreen
{
fill
:
$common-green
;
}
.cdark
{
color
:
$common-gray-dark
;
}
.text-secondary
{
color
:
$gl-text-color-secondary
;
...
...
app/helpers/diff_helper.rb
View file @
8e7f84b5
...
...
@@ -152,11 +152,11 @@ module DiffHelper
def
diff_file_changed_icon
(
diff_file
)
if
diff_file
.
deleted_file?
||
diff_file
.
renamed_file?
"
minus
"
"
file-deletion
"
elsif
diff_file
.
new_file?
"
plus
"
"
file-addition
"
else
"
adjust
"
"
file-modified
"
end
end
...
...
app/views/projects/diffs/_stats.html.haml
View file @
8e7f84b5
...
...
@@ -22,7 +22,7 @@
-
diff_files
.
each
do
|
diff_file
|
%li
%a
.diff-changed-file
{
href:
"##{hexdigest(diff_file.file_path)}"
,
title:
diff_file
.
new_path
}
=
icon
(
"
#{
diff_file_changed_icon
(
diff_file
)
}
fw"
,
class:
"
#{
diff_file_changed_icon_color
(
diff_file
)
}
diff-file-changed-icon append-right-8"
)
=
sprite_icon
(
diff_file_changed_icon
(
diff_file
),
size:
16
,
css_
class:
"
#{
diff_file_changed_icon_color
(
diff_file
)
}
diff-file-changed-icon append-right-8"
)
%span
.diff-changed-file-content.append-right-8
%strong
.diff-changed-file-name
=
diff_file
.
blob
.
name
%span
.diff-changed-file-path.prepend-top-5
=
diff_file
.
new_path
...
...
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