BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit c31d9b73 by Dmitriy Zaporozhets
Options

Merge branch 'improve-mr-widgets' into 'master'

Improve MR widgets Before: ![Screenshot 2014-10-14 17.49.03](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/0283aa379e/Screenshot_2014-10-14_17.49.03.png) After: ![Screenshot 2014-10-14 17.48.58](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/ca9f2bae19/Screenshot_2014-10-14_17.48.58.png) See merge request !1178
parents ab1e131a 0d30b13a
Showing with 12 additions and 11 deletions
app/assets/stylesheets/sections/merge_requests.scss
...@@ -111,7 +111,8 @@ ...@@ -111,7 +111,8 @@
.ci_widget { .ci_widget {
padding: 10px 15px; padding: 10px 15px;
font-size: 15px; font-size: 15px;
border-bottom: 1px dashed #AAA; border-bottom: 1px solid #BBB;
color: #777;
&.ci-success { &.ci-success {
color: $bg_success; color: $bg_success;
...@@ -143,7 +144,8 @@ ...@@ -143,7 +144,8 @@
padding: 10px 15px; padding: 10px 15px;
h4 { h4 {
margin-top: 0px; font-size: 20px;
font-weight: normal;
} }
p:last-child { p:last-child {
......
app/views/projects/merge_requests/show/_mr_accept.html.haml
...@@ -16,15 +16,6 @@ ...@@ -16,15 +16,6 @@
%h4 %h4
You can accept this request automatically. You can accept this request automatically.
.accept-merge-holder.clearfix .accept-merge-holder.clearfix
.js-toggle-container
%p
You can
%strong= link_to "modify merge commit message", "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message"
before accepting merge request
.js-toggle-content.hide
= render 'shared/commit_message_container', params: params,
text: @merge_request.merge_commit_message,
rows: 14, hint: true
.accept-group .accept-group
.pull-left .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"
...@@ -33,6 +24,14 @@ ...@@ -33,6 +24,14 @@
= 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
.js-toggle-container
%label
%i.fa.fa-edit
= link_to "modify merge commit message", "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message"
.js-toggle-content.hide
= render 'shared/commit_message_container', params: params,
text: @merge_request.merge_commit_message,
rows: 14, hint: true
%hr %hr
.light .light
......
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