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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
78f4c789
Commit
78f4c789
authored
May 30, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved Commit diff -> Images. Red border for removed & green for added images
parent
b826a684
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
125 additions
and
101 deletions
+125
-101
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+0
-100
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/commits.scss
+114
-0
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+10
-0
app/views/commits/_diffs.html.haml
app/views/commits/_diffs.html.haml
+1
-1
No files found.
app/assets/stylesheets/common.scss
View file @
78f4c789
...
@@ -450,106 +450,6 @@ input.git_clone_url {
...
@@ -450,106 +450,6 @@ input.git_clone_url {
background
:
#fff
!
important
;
background
:
#fff
!
important
;
}
}
/**
*
* COMMIT SHOw
*
*/
.diff_file
{
border
:
1px
solid
#CCC
;
margin-bottom
:
1em
;
.diff_file_header
{
padding
:
7px
5px
;
border-bottom
:
1px
solid
#CCC
;
background
:
#eee
;
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#eee
)
,
to
(
#dfdfdf
));
background-image
:
-webkit-linear-gradient
(
#eee
6
.6%
,
#dfdfdf
);
background-image
:
-moz-linear-gradient
(
#eee
6
.6%
,
#dfdfdf
);
background-image
:
-o-linear-gradient
(
#eee
6
.6%
,
#dfdfdf
);
span
{
font-size
:
14px
;
}
}
.diff_file_content
{
overflow
:auto
;
overflow-y
:hidden
;
background
:
#fff
;
color
:
#333
;
font-size
:
12px
;
font-family
:
'Menlo'
,
'Courier New'
,
'andale mono'
,
'lucida console'
,
monospace
;
}
.diff_file_content_image
{
background
:
#eee
;
text-align
:center
;
img
{
padding
:
50px
;
max-width
:
400px
;
}
}
}
.diff_file_content
{
table
{
border
:none
;
margin
:
0px
;
padding
:
0px
;
tr
{
td
{
font-size
:
12px
;
}
}
}
.old_line
,
.new_line
{
margin
:
0px
;
padding
:
0px
;
border
:none
;
background
:
#EEE
;
color
:
#666
;
padding
:
0px
5px
;
border-right
:
1px
solid
#ccc
;
text-align
:right
;
min-width
:
35px
;
max-width
:
35px
;
width
:
35px
;
moz-user-select
:
none
;
-khtml-user-select
:
none
;
user-select
:
none
;
a
{
float
:left
;
width
:
35px
;
font-weight
:normal
;
color
:
#666
;
&
:hover
{
text-decoration
:underline
;
}
}
}
.line_content
{
white-space
:pre
;
height
:
14px
;
margin
:
0px
;
padding
:
0px
;
border
:none
;
&
.new
{
background
:
#CFD
;
}
&
.old
{
background
:
#FDD
;
}
&
.matched
{
color
:
#ccc
;
background
:
#fafafa
;
}
}
}
/** COMMIT BLOCK **/
.commit-title
{
display
:
block
;}
.commit-title
{
margin-bottom
:
10px
}
.commit-author
,
.commit-committer
{
display
:
block
;
color
:
#999
;
font-weight
:
normal
;
font-style
:
italic
;}
.commit-author
strong
,
.commit-committer
strong
{
font-weight
:
bold
;
font-style
:
normal
;}
/** bordered list **/
/** bordered list **/
ul
.bordered-list
{
ul
.bordered-list
{
...
...
app/assets/stylesheets/sections/commits.scss
View file @
78f4c789
...
@@ -52,3 +52,117 @@
...
@@ -52,3 +52,117 @@
}
}
}
}
}
}
/**
*
* COMMIT SHOw
*
*/
.diff_file
{
border
:
1px
solid
#CCC
;
margin-bottom
:
1em
;
.diff_file_header
{
padding
:
7px
5px
;
border-bottom
:
1px
solid
#CCC
;
background
:
#eee
;
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#eee
)
,
to
(
#dfdfdf
));
background-image
:
-webkit-linear-gradient
(
#eee
6
.6%
,
#dfdfdf
);
background-image
:
-moz-linear-gradient
(
#eee
6
.6%
,
#dfdfdf
);
background-image
:
-o-linear-gradient
(
#eee
6
.6%
,
#dfdfdf
);
span
{
font-size
:
14px
;
}
}
.diff_file_content
{
overflow
:auto
;
overflow-y
:hidden
;
background
:
#fff
;
color
:
#333
;
font-size
:
12px
;
font-family
:
'Menlo'
,
'Courier New'
,
'andale mono'
,
'lucida console'
,
monospace
;
}
.diff_file_content_image
{
background
:
#eee
;
text-align
:center
;
img
{
margin
:
50px
;
padding
:
1px
;
max-width
:
400px
;
}
&
.diff_image_removed
{
img
{
border
:
1px
solid
#C00
;
}
}
&
.diff_image_added
{
img
{
border
:
1px
solid
#0C0
;;
}
}
}
}
.diff_file_content
{
table
{
border
:none
;
margin
:
0px
;
padding
:
0px
;
tr
{
td
{
font-size
:
12px
;
}
}
}
.old_line
,
.new_line
{
margin
:
0px
;
padding
:
0px
;
border
:none
;
background
:
#EEE
;
color
:
#666
;
padding
:
0px
5px
;
border-right
:
1px
solid
#ccc
;
text-align
:right
;
min-width
:
35px
;
max-width
:
35px
;
width
:
35px
;
moz-user-select
:
none
;
-khtml-user-select
:
none
;
user-select
:
none
;
a
{
float
:left
;
width
:
35px
;
font-weight
:normal
;
color
:
#666
;
&
:hover
{
text-decoration
:underline
;
}
}
}
.line_content
{
white-space
:pre
;
height
:
14px
;
margin
:
0px
;
padding
:
0px
;
border
:none
;
&
.new
{
background
:
#CFD
;
}
&
.old
{
background
:
#FDD
;
}
&
.matched
{
color
:
#ccc
;
background
:
#fafafa
;
}
}
}
/** COMMIT BLOCK **/
.commit-title
{
display
:
block
;}
.commit-title
{
margin-bottom
:
10px
}
.commit-author
,
.commit-committer
{
display
:
block
;
color
:
#999
;
font-weight
:
normal
;
font-style
:
italic
;}
.commit-author
strong
,
.commit-committer
strong
{
font-weight
:
bold
;
font-style
:
normal
;}
app/helpers/commits_helper.rb
View file @
78f4c789
...
@@ -86,4 +86,14 @@ module CommitsHelper
...
@@ -86,4 +86,14 @@ module CommitsHelper
end
end
end
end
end
end
def
image_diff_class
(
diff
)
if
diff
.
deleted_file
"diff_image_removed"
elsif
diff
.
new_file
"diff_image_added"
else
nil
end
end
end
end
app/views/commits/_diffs.html.haml
View file @
78f4c789
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
-
if
file
.
text?
-
if
file
.
text?
=
render
"commits/text_file"
,
:diff
=>
diff
,
:index
=>
i
=
render
"commits/text_file"
,
:diff
=>
diff
,
:index
=>
i
-
elsif
file
.
image?
-
elsif
file
.
image?
.diff_file_content_image
.diff_file_content_image
{
:class
=>
image_diff_class
(
diff
)}
%img
{
:src
=>
"data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"
}
%img
{
:src
=>
"data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"
}
-
else
-
else
%p
%p
...
...
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