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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
9511ec84
Commit
9511ec84
authored
Feb 12, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improved diff, restyled login page
parent
cc1ba255
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
4 deletions
+13
-4
app/assets/stylesheets/commits.css.scss
app/assets/stylesheets/commits.css.scss
+5
-1
app/assets/stylesheets/login.scss
app/assets/stylesheets/login.scss
+4
-1
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+1
-1
app/views/commits/_text_file.html.haml
app/views/commits/_text_file.html.haml
+1
-1
app/views/commits/show.html.haml
app/views/commits/show.html.haml
+2
-0
No files found.
app/assets/stylesheets/commits.css.scss
View file @
9511ec84
...
@@ -75,11 +75,15 @@
...
@@ -75,11 +75,15 @@
padding
:
0px
;
padding
:
0px
;
border
:none
;
border
:none
;
&
.new
{
&
.new
{
background
:
#
D
FD
;
background
:
#
C
FD
;
}
}
&
.old
{
&
.old
{
background
:
#FDD
;
background
:
#FDD
;
}
}
&
.matched
{
color
:
#ccc
;
background
:
#fafafa
;
}
}
}
}
}
...
...
app/assets/stylesheets/login.scss
View file @
9511ec84
/* 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
;
...
...
app/helpers/commits_helper.rb
View file @
9511ec84
...
@@ -65,7 +65,7 @@ module CommitsHelper
...
@@ -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
)
...
...
app/views/commits/_text_file.html.haml
View file @
9511ec84
...
@@ -4,7 +4,7 @@
...
@@ -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
...
...
app/views/commits/show.html.haml
View file @
9511ec84
...
@@ -13,6 +13,8 @@
...
@@ -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"
...
...
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