Download as
Browse Code »

Commit 0321a3c9b404b4c1a68a92a5a2bdc4d07ed7a527

Authored by randx
1 parent 89d3366e
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

MR: merged badge. Removed colors from MR list

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