BigW Consortium Gitlab

Style accept widgets for MR

parent b62d4f6d
...@@ -4,10 +4,6 @@ ...@@ -4,10 +4,6 @@
* *
*/ */
.automerge_widget { .automerge_widget {
&.can_be_merged {
background: #DFF0D8;
}
form { form {
margin-bottom: 0; margin-bottom: 0;
.clearfix { .clearfix {
...@@ -16,10 +12,10 @@ ...@@ -16,10 +12,10 @@
} }
.accept-group { .accept-group {
label {
margin: 5px;
margin-left: 20px;
} }
.how_to_merge_link {
@extend .primary;
} }
} }
...@@ -33,11 +29,6 @@ ...@@ -33,11 +29,6 @@
} }
} }
.merge-in-progress {
@extend .padded;
@extend .append-bottom-10;
}
.mr_source_commit, .mr_source_commit,
.mr_target_commit { .mr_target_commit {
.commit { .commit {
......
- unless @allowed_to_merge - unless @allowed_to_merge
.alert .bs-callout
%strong You don't have permission to merge this MR %strong You don't have permission to merge this MR
- if @show_merge_controls - if @show_merge_controls
.automerge_widget.can_be_merged{style: "display:none"} .automerge_widget.can_be_merged.hide
.alert.alert-success .bs-callout.bs-callout-success.clearfix
%span
= form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f| = form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f|
%p %h4
You can accept this request automatically. You can accept this request automatically.
%p
If you still want to do it manually - If you still want to do it manually -
%strong %strong
= link_to "click here", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" = link_to "click here", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
for instructions for instructions
.accept-group .accept-group
.pull-left
= f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request" = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
- unless @merge_request.disallow_source_branch_removal? - unless @merge_request.disallow_source_branch_removal?
.remove_branch_holder .remove_branch_holder.pull-left
= label_tag :should_remove_source_branch, class: "checkbox" do = label_tag :should_remove_source_branch, class: "checkbox" do
= check_box_tag :should_remove_source_branch = check_box_tag :should_remove_source_branch
Remove source-branch Remove source-branch
.clearfix
.automerge_widget.no_satellite{style: "display:none"} .automerge_widget.no_satellite.hide
.alert.alert-danger .bs-callout.bs-callout-danger
%span %span
%strong This repository does not have satellite. Ask an administrator to fix this issue %strong This repository does not have satellite. Ask an administrator to fix this issue
.automerge_widget.cannot_be_merged{style: "display:none"} .automerge_widget.cannot_be_merged.hide
.alert.alert-disabled .bs-callout.bs-callout-disabled
%span %span
= link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn padded", title: "How To Merge", "data-toggle" => "modal" = link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn padded", title: "How To Merge", "data-toggle" => "modal"
   
%strong This request can't be merged with GitLab. You should do it manually %strong This request can't be merged with GitLab. You should do it manually
.automerge_widget.unchecked .automerge_widget.unchecked
.alert.alert-warning .bs-callout.bs-callout-warning
%strong %strong
%i.icon-refresh %i.icon-refresh.icon-spin
Checking for ability to automatically merge… Checking for ability to automatically merge…
.automerge_widget.already_cannot_be_merged{style: "display:none"} .automerge_widget.already_cannot_be_merged.hide
.alert.alert-info .bs-callout.bs-callout-info
%strong This merge request already can not be merged. Try to reload page. %strong This merge request already can not be merged. Try to reload page.
.merge-in-progress.hide .merge-in-progress.hide
%span.cgray .bs-callout.bs-callout-success
%i.icon-refresh.icon-spin %i.icon-refresh.icon-spin
   
Merge is in progress. Please wait. Page will be automatically reloaded.   Merge is in progress. Please wait. Page will be automatically reloaded.  
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment