Improved Commit diff -> Images. Red border for removed & green for added images
This commit is contained in:
randx
parent
b826a684c7
commit
78f4c789b3
4 changed files with 125 additions and 101 deletions
|
|
@ -450,106 +450,6 @@ input.git_clone_url {
|
|||
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 **/
|
||||
ul.bordered-list {
|
||||
|
|
|
|||
|
|
@ -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;}
|
||||
|
||||
|
|
|
|||
|
|
@ -86,4 +86,14 @@ module CommitsHelper
|
|||
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
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
- if file.text?
|
||||
= render "commits/text_file", :diff => diff, :index => i
|
||||
- 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)}"}
|
||||
- else
|
||||
%p
|
||||
|
|
|
|||
Loading…
Reference in a new issue