Commit 9511ec84 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

improved diff, restyled login page

parent cc1ba255
No related merge requests found
......@@ -75,11 +75,15 @@
padding:0px;
border:none;
&.new {
background: #DFD;
background: #CFD;
}
&.old {
background: #FDD;
}
&.matched {
color:#ccc;
background:#fafafa;
}
}
}
......
/* Login Page */
body.login-page{ padding-top: 10%}
body.login-page{
padding-top: 10%;
background:$style_color;
}
.login-box{
width: 304px;
......
......@@ -65,7 +65,7 @@ module CommitsHelper
line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0
line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0
yield(nil, type, nil, nil, nil)
yield(line, type, nil, nil, nil)
next
else
type = diff_line_class(line)
......
......@@ -4,7 +4,7 @@
- if type == "match"
%td.old_line= "..."
%td.new_line= "..."
%td.line_content  
%td.line_content.matched= line
- else
%td.old_line= link_to raw(type == "new" ? " " : line_old), "##{line_code}", :id => line_code
%td.new_line= link_to raw(type == "old" ? " " : line_new) , "##{line_code}", :id => line_code
......
......@@ -13,6 +13,8 @@
.clear
%br
%p.cgray
Showing #{pluralize(@commit.diffs.count, "changed file")}
= render "commits/diffs", :diffs => @commit.diffs
= render "notes/notes"
= render "notes/per_line_form"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment