}
}
&.merged {
- background: #FEF;
- border-color:#EDE;
+ background: #F5f5f5;
+ border-color:#E5E5E5;
.icon {
background: #DAD;
border:1px solid #B8B;
.label {
background-color: #474D57;
+ &.label-important {
+ background-color: #B94A48;
+ }
}
.nav-tabs > li > a, .nav-pills > li > a {
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);
border-bottom-left-radius: 4px;
border-left: 0;
}
- padding: 10px 25px;
+ padding: 9px 25px;
display: inline-block;
color: $style_color;
position: relative;
classes = "merge_request"
classes << " closed" if mr.closed
classes << " merged" if mr.merged?
- classes << " today" if mr.today?
classes
end
end
%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)
.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")
%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
%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
%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"