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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
50b1f09a
Commit
50b1f09a
authored
Aug 11, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small UI improvements to git blame page
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
cf6e58b5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
13 deletions
+17
-13
app/assets/stylesheets/generic/files.scss
app/assets/stylesheets/generic/files.scss
+1
-6
app/assets/stylesheets/pages/tree.scss
app/assets/stylesheets/pages/tree.scss
+4
-0
app/views/projects/blame/show.html.haml
app/views/projects/blame/show.html.haml
+12
-7
No files found.
app/assets/stylesheets/generic/files.scss
View file @
50b1f09a
...
@@ -90,12 +90,7 @@
...
@@ -90,12 +90,7 @@
border-right
:
none
;
border-right
:
none
;
}
}
background
:
#fff
;
background
:
#fff
;
padding
:
5px
;
padding
:
8px
;
}
.author
,
.blame_commit
{
background
:
$background-color
;
vertical-align
:
top
;
}
}
.lines
{
.lines
{
pre
{
pre
{
...
...
app/assets/stylesheets/pages/tree.scss
View file @
50b1f09a
...
@@ -89,6 +89,10 @@
...
@@ -89,6 +89,10 @@
td
.blame-commit
{
td
.blame-commit
{
background
:
#f9f9f9
;
background
:
#f9f9f9
;
min-width
:
350px
;
min-width
:
350px
;
.commit-author-link
{
color
:
#888
;
}
}
}
td
.blame-numbers
{
td
.blame-numbers
{
pre
{
pre
{
...
...
app/views/projects/blame/show.html.haml
View file @
50b1f09a
...
@@ -16,14 +16,19 @@
...
@@ -16,14 +16,19 @@
-
@blame
.
each
do
|
raw_commit
,
line
|
-
@blame
.
each
do
|
raw_commit
,
line
|
%tr
%tr
%td
.blame-commit
%td
.blame-commit
%span
.commit
.commit
-
unless
@prev_commit
&&
@prev_commit
.
sha
==
raw_commit
.
sha
-
unless
@prev_commit
&&
@prev_commit
.
sha
==
raw_commit
.
sha
-
commit
=
Commit
.
new
(
raw_commit
,
@project
)
-
commit
=
Commit
.
new
(
raw_commit
,
@project
)
=
link_to
commit
.
short_id
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
commit
),
class:
"commit_short_id"
.commit-row-title
%strong
=
commit_author_link
(
commit
,
avatar:
true
,
size:
16
)
=
link_to_gfm
truncate
(
commit
.
title
,
length:
35
),
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
commit
.
id
),
class:
"cdark"
.pull-right
=
link_to
commit
.
short_id
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
commit
),
class:
"monospace"
=
link_to_gfm
truncate
(
commit
.
title
,
length:
20
),
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
commit
.
id
),
class:
"row_title"
.light
=
commit_author_link
(
commit
,
avatar:
false
)
authored
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
-
@prev_commit
=
raw_commit
-
@prev_commit
=
raw_commit
%td
.lines.blame-numbers
%td
.lines.blame-numbers
%pre
%pre
...
...
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