MR: merged badge. Removed colors from MR list

randx
1 parent 89d3366e
Showing 10 changed files with 28 additions and 25 deletions Show diff stats
app/assets/stylesheets/common.scss
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/nav.scss
app/helpers/merge_requests_helper.rb
app/views/issues/_show.html.haml
app/views/issues/index.html.haml
app/views/issues/show.html.haml
app/views/merge_requests/_merge_request.html.haml
app/views/merge_requests/index.html.haml
app/views/merge_requests/show.html.haml
@@ -694,8 +694,8 @@ li.note {
     }
   }
   &.merged { 
-    background: #FEF;
-    border-color:#EDE;
+    background: #F5f5f5;
+    border-color:#E5E5E5;
     .icon { 
       background: #DAD;
       border:1px solid #B8B;
@@ -174,6 +174,9 @@ a:focus {
  
 .label { 
   background-color: #474D57;
+  &.label-important { 
+    background-color: #B94A48;
+  }
 }
  
 .nav-tabs > li > a, .nav-pills > li > a {
@@ -8,7 +8,7 @@ nav.main_menu {
   margin:30px 0;
   background:#eee;
   border:1px solid #bbb;
-  height:38px;
+  height:36px;
   background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
   background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
   background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
@@ -55,7 +55,7 @@ nav.main_menu {
       border-bottom-left-radius: 4px;
       border-left: 0;
     }
-    padding: 10px 25px;
+    padding: 9px 25px;
     display: inline-block;
     color: $style_color;
     position: relative;
@@ -36,7 +36,6 @@ module MergeRequestsHelper
     classes = "merge_request"
     classes << " closed" if mr.closed
     classes << " merged" if mr.merged?
-    classes << " today" if mr.today?
     classes
   end
 end
@@ -19,6 +19,6 @@
     %strong= issue.assignee_name
     - if issue.upvotes > 0
       %span.badge.badge-success= "+#{issue.upvotes}"
-
+  
   = link_to project_issue_path(issue.project, issue) do
     %p.row_title= truncate(issue.title, :length => 100)
@@ -17,16 +17,16 @@
  
   .issues_legend
     .list_legend
+      .icon.today
+      .text Today
+
+    .list_legend
       .icon.critical
       .text Critical
  
     .list_legend
       .icon.closed
       .text Closed
-
-    .list_legend
-      .icon.today
-      .text Today
   .clearfix
  
   %div#issues-table-holder.ui-box
 %h3
   Issue ##{@issue.id}
+
   %small
     created at
     = @issue.created_at.stamp("Aug 21, 2011")
@@ -48,6 +49,11 @@
         %strong
           = truncate(milestone.title, :length => 20)
  
+    .right
+      - if @issue.critical
+        %span.label.label-important
+          Critical
+
   - if @issue.description.present?
     .bottom_box_content
       = preserve do
 %li.wll{ :class => mr_css_classes(merge_request) }
-  .list_legend
-    .icon
   .right
     .left
+      - if merge_request.merged?
+        %span.btn.small.disabled.padded
+          %strong
+            %i.icon-ok
+            = "MERGED"
       - if merge_request.notes.any?
         %span.btn.small.disabled.padded= pluralize merge_request.notes.count, 'note'
       %span.btn.small.disabled.padded
@@ -6,19 +6,6 @@
  
 %br
  
-.mrs_legend
-  .list_legend
-    .icon.today
-    .text Today
-
-  .list_legend
-    .icon.merged
-    .text Merged
-
-  .list_legend
-    .icon.closed
-    .text Closed
-.clearfix
  
 .ui-box
   .title
@@ -6,6 +6,11 @@
   %span.pretty_label.branch= @merge_request.target_branch
  
   %span.right
+    - if @merge_request.merged?
+      %span.btn.small.disabled.padded
+        %strong
+          %i.icon-ok
+          = "MERGED"
     - if can?(current_user, :modify_merge_request, @merge_request)
       - if @merge_request.open?
         = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded danger", :title => "Close merge request"
...	...	@@ -694,8 +694,8 @@ li.note {
694	694	}
695	695	}
696	696	&.merged {
697		- background: #FEF;
698		- border-color:#EDE;
	697	+ background: #F5f5f5;
	698	+ border-color:#E5E5E5;
699	699	.icon {
700	700	background: #DAD;
701	701	border:1px solid #B8B;
...	...
...	...	@@ -174,6 +174,9 @@ a:focus {
174	174
175	175	.label {
176	176	background-color: #474D57;
	177	+ &.label-important {
	178	+ background-color: #B94A48;
	179	+ }
177	180	}
178	181
179	182	.nav-tabs > li > a, .nav-pills > li > a {
...	...
...	...	@@ -8,7 +8,7 @@ nav.main_menu {
8	8	margin:30px 0;
9	9	background:#eee;
10	10	border:1px solid #bbb;
11		- height:38px;
	11	+ height:36px;
12	12	background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
13	13	background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
14	14	background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
...	...	@@ -55,7 +55,7 @@ nav.main_menu {
55	55	border-bottom-left-radius: 4px;
56	56	border-left: 0;
57	57	}
58		- padding: 10px 25px;
	58	+ padding: 9px 25px;
59	59	display: inline-block;
60	60	color: $style_color;
61	61	position: relative;
...	...
...	...	@@ -36,7 +36,6 @@ module MergeRequestsHelper
36	36	classes = "merge_request"
37	37	classes << " closed" if mr.closed
38	38	classes << " merged" if mr.merged?
39		- classes << " today" if mr.today?
40	39	classes
41	40	end
42	41	end
...	...
...	...	@@ -19,6 +19,6 @@
19	19	%strong= issue.assignee_name
20	20	- if issue.upvotes > 0
21	21	%span.badge.badge-success= "+#{issue.upvotes}"
22		-
	22	+
23	23	= link_to project_issue_path(issue.project, issue) do
24	24	%p.row_title= truncate(issue.title, :length => 100)
...	...
...	...	@@ -17,16 +17,16 @@
17	17
18	18	.issues_legend
19	19	.list_legend
	20	+ .icon.today
	21	+ .text Today
	22	+
	23	+ .list_legend
20	24	.icon.critical
21	25	.text Critical
22	26
23	27	.list_legend
24	28	.icon.closed
25	29	.text Closed
26		-
27		- .list_legend
28		- .icon.today
29		- .text Today
30	30	.clearfix
31	31
32	32	%div#issues-table-holder.ui-box
...	...
1	1	%h3
2	2	Issue ##{@issue.id}
	3	+
3	4	%small
4	5	created at
5	6	= @issue.created_at.stamp("Aug 21, 2011")
...	...	@@ -48,6 +49,11 @@
48	49	%strong
49	50	= truncate(milestone.title, :length => 20)
50	51
	52	+ .right
	53	+ - if @issue.critical
	54	+ %span.label.label-important
	55	+ Critical
	56	+
51	57	- if @issue.description.present?
52	58	.bottom_box_content
53	59	= preserve do
...	...
1	1	%li.wll{ :class => mr_css_classes(merge_request) }
2		- .list_legend
3		- .icon
4	2	.right
5	3	.left
	4	+ - if merge_request.merged?
	5	+ %span.btn.small.disabled.padded
	6	+ %strong
	7	+ %i.icon-ok
	8	+ = "MERGED"
6	9	- if merge_request.notes.any?
7	10	%span.btn.small.disabled.padded= pluralize merge_request.notes.count, 'note'
8	11	%span.btn.small.disabled.padded
...	...
...	...	@@ -6,19 +6,6 @@
6	6
7	7	%br
8	8
9		-.mrs_legend
10		- .list_legend
11		- .icon.today
12		- .text Today
13		-
14		- .list_legend
15		- .icon.merged
16		- .text Merged
17		-
18		- .list_legend
19		- .icon.closed
20		- .text Closed
21		-.clearfix
22	9
23	10	.ui-box
24	11	.title
...	...
...	...	@@ -6,6 +6,11 @@
6	6	%span.pretty_label.branch= @merge_request.target_branch
7	7
8	8	%span.right
	9	+ - if @merge_request.merged?
	10	+ %span.btn.small.disabled.padded
	11	+ %strong
	12	+ %i.icon-ok
	13	+ = "MERGED"
9	14	- if can?(current_user, :modify_merge_request, @merge_request)
10	15	- if @merge_request.open?
11	16	= link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded danger", :title => "Close merge request"
...	...