Download as
Browse Code »

Commit bc7897180d8cfad0f573137d379fedfa7939ee0f

Authored by randx
1 parent 9a709f76
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Better visibility of event commit links & commits ids

Showing 6 changed files with 23 additions and 9 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @bc78971
... ... @@ -337,6 +337,15 @@ p.time {
337 337 padding: 15px 5px;
338 338 &:last-child { border:none }
339 339 .wll:hover { background:none }
  340 +
  341 + .event_commits {
  342 + margin-top: 5px;
  343 +
  344 + li.commit {
  345 + padding:5px;
  346 + border:none;
  347 + }
  348 + }
340 349 }
341 350  
342 351 .ico {
... ...
app/assets/stylesheets/gitlab_bootstrap.scss
  Diff comments   View file @bc78971
... ... @@ -18,7 +18,8 @@ a {
18 18 }
19 19  
20 20 &.lined {
21   - text-decoration:underlined;
  21 + text-decoration:underline;
  22 + &:hover { text-decoration:underline; }
22 23 }
23 24  
24 25 &.gray {
... ...
app/assets/stylesheets/sections/commits.scss
  Diff comments   View file @bc78971
... ... @@ -199,4 +199,11 @@
199 199 background:#FCEEC1;
200 200 color:$style_color;
201 201 }
  202 +
  203 + .commit_short_id {
  204 + float:left;
  205 + @extend .lined;
  206 + min-width:65px;
  207 + font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
  208 + }
202 209 }
... ...
app/assets/stylesheets/sections/issues.scss
  Diff comments   View file @bc78971
... ... @@ -32,15 +32,12 @@
32 32  
33 33 p {
34 34 padding-top:0;
  35 + padding-bottom:2px;
35 36 }
36 37  
37 38 img.avatar {
38 39 width:32px;
39 40 margin-top:4px;
40 41 }
41   - .row_title {
42   - padding:0px;
43   - padding-bottom:2px;
44   - }
45 42 }
46 43 }
... ...
app/views/commits/_commit.html.haml
  Diff comments   View file @bc78971
... ... @@ -3,7 +3,7 @@
3 3 %p
4 4 %strong= link_to "Browse Code »", tree_project_ref_path(@project, commit.id), :class => "right"
5 5 %p
6   - %code.left= link_to commit.short_id, project_commit_path(@project, :id => commit.id)
  6 + = link_to commit.short_id(8), project_commit_path(@project, :id => commit.id), :class => "commit_short_id"
7 7 %strong.cgray= commit.author_name
8 8 –
9 9 = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
... ...
app/views/events/_commit.html.haml
  Diff comments   View file @bc78971
1 1 - commit = CommitDecorator.decorate(commit)
2 2 %li.wll.commit
3 3 %p
4   - %code.left= link_to commit.short_id, project_commit_path(project, :id => commit.id)
5   - %strong.cgray= commit.author_name
  4 + = link_to commit.short_id(8), project_commit_path(project, :id => commit.id), :class => "commit_short_id"
  5 + %strong.cdark= commit.author_name
6 6 –
7 7 = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
8   - = link_to truncate(commit.title, :length => 50), project_commit_path(project, :id => commit.id), :class => "row_title" rescue "--broken encoding"
  8 + = truncate(commit.title, :length => 50) rescue "--broken encoding"
9 9  
... ...