deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

improved diff, restyled login page

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-02-12 00:29:16 +02:00
parent cc1ba255d6
commit 9511ec846d
5 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/commits.css.scss
View file

@ -75,11 +75,15 @@
padding:0px; padding:0px;
border:none; border:none;
&.new { &.new {
background: #DFD; background: #CFD;
} }
&.old { &.old {
background: #FDD; background: #FDD;
} }
&.matched {
color:#ccc;
background:#fafafa;
}
} }
} }

5
app/assets/stylesheets/login.scss
View file

@ -1,5 +1,8 @@
/* Login Page */ /* Login Page */
body.login-page{ padding-top: 10%} body.login-page{
padding-top: 10%;
background:$style_color;
}
.login-box{ .login-box{
width: 304px; width: 304px;

2
app/helpers/commits_helper.rb
View file

@ -65,7 +65,7 @@ module CommitsHelper
line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0 line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0
line_new = 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 next
else else
type = diff_line_class(line) type = diff_line_class(line)

2
app/views/commits/_text_file.html.haml
View file

@ -4,7 +4,7 @@
- if type == "match" - if type == "match"
%td.old_line= "..." %td.old_line= "..."
%td.new_line= "..." %td.new_line= "..."
%td.line_content   %td.line_content.matched= line
- else - else
%td.old_line= link_to raw(type == "new" ? " " : line_old), "##{line_code}", :id => line_code %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 %td.new_line= link_to raw(type == "old" ? " " : line_new) , "##{line_code}", :id => line_code

2
app/views/commits/show.html.haml
View file

@ -13,6 +13,8 @@
.clear .clear
%br %br
%p.cgray
Showing #{pluralize(@commit.diffs.count, "changed file")}
= render "commits/diffs", :diffs => @commit.diffs = render "commits/diffs", :diffs => @commit.diffs
= render "notes/notes" = render "notes/notes"
= render "notes/per_line_form" = render "notes/per_line_form"