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

Steven Verbeek
1 parent c43ac3c7
Showing 2 changed files with 11 additions and 7 deletions Show diff stats
app/assets/stylesheets/common.scss
app/views/issues/_show.html.haml
@@ -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);
 %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}"
...	...	@@ -250,8 +250,12 @@ nav.main_menu {
250	250	background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
251	251	@include shade;
252	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	260	.label {
257	261	background:$hover;
...	...	@@ -302,8 +306,8 @@ nav.main_menu {
302	306
303	307	img.avatar {
304	308	float:left;
305		- margin-right:15px;
306		- width:40px;
	309	+ margin-right:10px;
	310	+ width:35px;
307	311	-webkit-border-radius: 4px;
308	312	-moz-border-radius: 4px;
309	313	border-radius: 4px;
...	...	@@ -326,7 +330,7 @@ img.lil_av {
326	330
327	331	.wll {
328	332	background-color: #FFF;
329		- padding: 10px 5px;
	333	+ padding: 6px 10px;
330	334	min-height: 20px;
331	335	border-bottom: 1px solid #eee;
332	336	border-bottom: 1px solid rgba(0, 0, 0, 0.05);
...	...
1	1	%li.wll{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) }
2	2	.right
	3	+ - if issue.notes.any?
	4	+ %span.label= pluralize issue.notes.count, 'comment'
3	5	- if can? current_user, :modify_issue, issue
4	6	- if issue.closed
5	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	16	%span.label.important critical
15	17	- if issue.today?
16	18	%span.label.success today
17		- - if issue.notes.any?
18		- %span.label= pluralize issue.notes.count, 'note'
19	19	- if issue.upvotes > 0
20	20	%span.label.success= "+#{issue.upvotes}"
21	21
...	...