summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrandx <dmitriy.zaporozhets@gmail.com>2012-07-28 00:27:54 +0300
committerrandx <dmitriy.zaporozhets@gmail.com>2012-07-28 00:27:54 +0300
commitbc7897180d8cfad0f573137d379fedfa7939ee0f (patch)
treebfa7c70b6ec84c792348585c2e09f0bc46bc35ea
parent9a709f76be3a3e8911f404aec6116a848748c943 (diff)
downloadgitlab-ce-bc7897180d8cfad0f573137d379fedfa7939ee0f.tar.gz
Better visibility of event commit links & commits ids
-rw-r--r--app/assets/stylesheets/common.scss9
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap.scss3
-rw-r--r--app/assets/stylesheets/sections/commits.scss7
-rw-r--r--app/assets/stylesheets/sections/issues.scss5
-rw-r--r--app/views/commits/_commit.html.haml2
-rw-r--r--app/views/events/_commit.html.haml6
6 files changed, 23 insertions, 9 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 0db803aae23..9d9bfb7db72 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 75d246cd349..b01f1274407 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 35c3cffd7f1..e2db701db71 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 0f144cf8235..12926d3fdb1 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 63339d36367..9824161493d 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
&ndash;
= 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 5a9d223d546..d6c5546148d 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
&ndash;
= 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"