From 550274e136811fff6ecadf51e285d8e850399e75 Mon Sep 17 00:00:00 2001 From: Steven Verbeek Date: Mon, 19 Mar 2012 21:32:08 -0300 Subject: [PATCH] Added badge, made the issue list smaller height wise, and moved # NOTES over to # comments --- app/assets/stylesheets/common.scss | 14 +++++++++----- app/views/issues/_show.html.haml | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 15766d28..810e747c 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -250,8 +250,12 @@ nav.main_menu { background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); @include shade; .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 { background:$hover; @@ -302,8 +306,8 @@ nav.main_menu { img.avatar { float:left; - margin-right:15px; - width:40px; + margin-right:10px; + width:35px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -326,7 +330,7 @@ img.lil_av { .wll { background-color: #FFF; - padding: 10px 5px; + padding: 6px 10px; min-height: 20px; border-bottom: 1px solid #eee; border-bottom: 1px solid rgba(0, 0, 0, 0.05); diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index 7b25579f..c2e7531e 100644 --- a/app/views/issues/_show.html.haml +++ b/app/views/issues/_show.html.haml @@ -1,5 +1,7 @@ %li.wll{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) } .right + - if issue.notes.any? + %span.label= pluralize issue.notes.count, 'comment' - if can? current_user, :modify_issue, issue - 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 @@ -14,8 +16,6 @@ %span.label.important critical - if issue.today? %span.label.success today - - if issue.notes.any? - %span.label= pluralize issue.notes.count, 'note' - if issue.upvotes > 0 %span.label.success= "+#{issue.upvotes}"