diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 0db803aa..9d9bfb7d 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -337,6 +337,15 @@ p.time { padding: 15px 5px; &:last-child { border:none } .wll:hover { background:none } + + .event_commits { + margin-top: 5px; + + li.commit { + padding:5px; + border:none; + } + } } .ico { diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index 75d246cd..b01f1274 100644 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -18,7 +18,8 @@ a { } &.lined { - text-decoration:underlined; + text-decoration:underline; + &:hover { text-decoration:underline; } } &.gray { diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index 35c3cffd..e2db701d 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -199,4 +199,11 @@ background:#FCEEC1; color:$style_color; } + + .commit_short_id { + float:left; + @extend .lined; + min-width:65px; + font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace; + } } diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/sections/issues.scss index 0f144cf8..12926d3f 100644 --- a/app/assets/stylesheets/sections/issues.scss +++ b/app/assets/stylesheets/sections/issues.scss @@ -32,15 +32,12 @@ p { padding-top:0; + padding-bottom:2px; } img.avatar { width:32px; margin-top:4px; } - .row_title { - padding:0px; - padding-bottom:2px; - } } } diff --git a/app/views/commits/_commit.html.haml b/app/views/commits/_commit.html.haml index 63339d36..98241614 100644 --- a/app/views/commits/_commit.html.haml +++ b/app/views/commits/_commit.html.haml @@ -3,7 +3,7 @@ %p %strong= link_to "Browse Code ยป", tree_project_ref_path(@project, commit.id), :class => "right" %p - %code.left= link_to commit.short_id, project_commit_path(@project, :id => commit.id) + = link_to commit.short_id(8), project_commit_path(@project, :id => commit.id), :class => "commit_short_id" %strong.cgray= commit.author_name – = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16 diff --git a/app/views/events/_commit.html.haml b/app/views/events/_commit.html.haml index 5a9d223d..d6c55461 100644 --- a/app/views/events/_commit.html.haml +++ b/app/views/events/_commit.html.haml @@ -1,9 +1,9 @@ - commit = CommitDecorator.decorate(commit) %li.wll.commit %p - %code.left= link_to commit.short_id, project_commit_path(project, :id => commit.id) - %strong.cgray= commit.author_name + = link_to commit.short_id(8), project_commit_path(project, :id => commit.id), :class => "commit_short_id" + %strong.cdark= commit.author_name – = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16 - = link_to truncate(commit.title, :length => 50), project_commit_path(project, :id => commit.id), :class => "row_title" rescue "--broken encoding" + = truncate(commit.title, :length => 50) rescue "--broken encoding"