Commit 550274e136811fff6ecadf51e285d8e850399e75
1 parent
c43ac3c7
Exists in
master
and in
4 other branches
Added badge, made the issue list smaller height wise, and moved # NOTES over to # comments
Showing
2 changed files
with
11 additions
and
7 deletions
Show diff stats
app/assets/stylesheets/common.scss
| @@ -250,8 +250,12 @@ nav.main_menu { | @@ -250,8 +250,12 @@ nav.main_menu { | ||
| 250 | background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); | 250 | background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); |
| 251 | @include shade; | 251 | @include shade; |
| 252 | .count { | 252 | .count { |
| 253 | - color:#aaa; | ||
| 254 | - margin-left:3px; | 253 | + margin-left:3px; |
| 254 | + color: #332; | ||
| 255 | + background: white; | ||
| 256 | + padding: 1px 6px 2px; | ||
| 257 | + font-weight: bold; | ||
| 258 | + -webkit-border-radius: 9px; | ||
| 255 | } | 259 | } |
| 256 | .label { | 260 | .label { |
| 257 | background:$hover; | 261 | background:$hover; |
| @@ -302,8 +306,8 @@ nav.main_menu { | @@ -302,8 +306,8 @@ nav.main_menu { | ||
| 302 | 306 | ||
| 303 | img.avatar { | 307 | img.avatar { |
| 304 | float:left; | 308 | float:left; |
| 305 | - margin-right:15px; | ||
| 306 | - width:40px; | 309 | + margin-right:10px; |
| 310 | + width:35px; | ||
| 307 | -webkit-border-radius: 4px; | 311 | -webkit-border-radius: 4px; |
| 308 | -moz-border-radius: 4px; | 312 | -moz-border-radius: 4px; |
| 309 | border-radius: 4px; | 313 | border-radius: 4px; |
| @@ -326,7 +330,7 @@ img.lil_av { | @@ -326,7 +330,7 @@ img.lil_av { | ||
| 326 | 330 | ||
| 327 | .wll { | 331 | .wll { |
| 328 | background-color: #FFF; | 332 | background-color: #FFF; |
| 329 | - padding: 10px 5px; | 333 | + padding: 6px 10px; |
| 330 | min-height: 20px; | 334 | min-height: 20px; |
| 331 | border-bottom: 1px solid #eee; | 335 | border-bottom: 1px solid #eee; |
| 332 | border-bottom: 1px solid rgba(0, 0, 0, 0.05); | 336 | border-bottom: 1px solid rgba(0, 0, 0, 0.05); |
app/views/issues/_show.html.haml
| 1 | %li.wll{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) } | 1 | %li.wll{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) } |
| 2 | .right | 2 | .right |
| 3 | + - if issue.notes.any? | ||
| 4 | + %span.label= pluralize issue.notes.count, 'comment' | ||
| 3 | - if can? current_user, :modify_issue, issue | 5 | - if can? current_user, :modify_issue, issue |
| 4 | - if issue.closed | 6 | - if issue.closed |
| 5 | = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn small", :remote => true | 7 | = 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 @@ | @@ -14,8 +16,6 @@ | ||
| 14 | %span.label.important critical | 16 | %span.label.important critical |
| 15 | - if issue.today? | 17 | - if issue.today? |
| 16 | %span.label.success today | 18 | %span.label.success today |
| 17 | - - if issue.notes.any? | ||
| 18 | - %span.label= pluralize issue.notes.count, 'note' | ||
| 19 | - if issue.upvotes > 0 | 19 | - if issue.upvotes > 0 |
| 20 | %span.label.success= "+#{issue.upvotes}" | 20 | %span.label.success= "+#{issue.upvotes}" |
| 21 | 21 |