deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added badge, made the issue list smaller height wise, and moved # NOTES over to # comments

Browse source
This commit is contained in:
Steven Verbeek 2012-03-19 21:32:08 -03:00
parent c43ac3c721
commit 550274e136
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/assets/stylesheets/common.scss
View file

@ -250,8 +250,12 @@ nav.main_menu {
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
@include shade; @include shade;
.count { .count {
color:#aaa; margin-left:3px;
margin-left:3px; color: #332;
background: white;
padding: 1px 6px 2px;
font-weight: bold;
-webkit-border-radius: 9px;
} }
.label { .label {
background:$hover; background:$hover;
@ -302,8 +306,8 @@ nav.main_menu {
img.avatar { img.avatar {
float:left; float:left;
margin-right:15px; margin-right:10px;
width:40px; width:35px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
@ -326,7 +330,7 @@ img.lil_av {
.wll { .wll {
background-color: #FFF; background-color: #FFF;
padding: 10px 5px; padding: 6px 10px;
min-height: 20px; min-height: 20px;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
border-bottom: 1px solid rgba(0, 0, 0, 0.05); border-bottom: 1px solid rgba(0, 0, 0, 0.05);

4
app/views/issues/_show.html.haml
View file

@ -1,5 +1,7 @@
%li.wll{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) } %li.wll{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) }
.right .right
- if issue.notes.any?
%span.label= pluralize issue.notes.count, 'comment'
- if can? current_user, :modify_issue, issue - if can? current_user, :modify_issue, issue
- if issue.closed - if issue.closed
= link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn small", :remote => true = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn small", :remote => true
@ -14,8 +16,6 @@
%span.label.important critical %span.label.important critical
- if issue.today? - if issue.today?
%span.label.success today %span.label.success today
- if issue.notes.any?
%span.label= pluralize issue.notes.count, 'note'
- if issue.upvotes > 0 - if issue.upvotes > 0
%span.label.success= "+#{issue.upvotes}" %span.label.success= "+#{issue.upvotes}"