use ui-box as for all

3 files changed, 42 insertions, 40 deletions

diff --git a/app/views/merge_requests/_form.html.haml b/app/views/merge_requests/_form.html.haml
index 37cde812298..67444dad5de 100644
--- a/app/views/merge_requests/_form.html.haml
+++ b/app/views/merge_requests/_form.html.haml
@@ -5,45 +5,47 @@
         - @merge_request.errors.full_messages.each do |msg|
           %li= msg
 
-  %h4.cdark 1. Select Branches
-  %br
+  %fieldset
+    %legend 1. Select Branches
 
-  .row
-    .span5
-      .mr_branch_box
-        %h5 From (Head Branch)
-        .body
-          .padded= f.select(:source_branch, @repository.heads.map(&:name), { include_blank: "Select branch" }, {class: 'chosen span4'})
-      .mr_source_commit
+    .row
+      .span5
+        .mr_branch_box
+          %h5 From (Head Branch)
+          .body
+            .padded= f.select(:source_branch, @repository.heads.map(&:name), { include_blank: "Select branch" }, {class: 'chosen span4'})
+        .mr_source_commit
 
-    .span2
-      %center= image_tag "merge.png", class: 'mr_direction_tip'
-    .span5
-      .mr_branch_box
-        %h5 To (Base Branch)
-        .body
-          .padded= f.select(:target_branch, @repository.heads.map(&:name), { include_blank: "Select branch" }, {class: 'chosen span4'})
-      .mr_target_commit
+      .span2
+        %center= image_tag "merge.png", class: 'mr_direction_tip'
+      .span5
+        .mr_branch_box
+          %h5 To (Base Branch)
+          .body
+            .padded= f.select(:target_branch, @repository.heads.map(&:name), { include_blank: "Select branch" }, {class: 'chosen span4'})
+        .mr_target_commit
 
-  %h4.cdark 2. Fill info
+  %fieldset
+    %legend 2. Fill info
 
-  .clearfix
-    .merge_requests_form_box
-      .top_box_content
-        = f.label :title do
-          %strong= "Title *"
-        .input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
-      .merge_requests_middle_box
-        .merge_requests_assignee
-          = f.label :assignee_id do
-            %i.icon-user
-            Assign to
-          .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'})
-        .merge_requests_milestone
-          = f.label :milestone_id do
-            %i.icon-time
-            Milestone
-          .input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
+    .ui-box.ui-box-show
+      .ui-box-head
+        .clearfix
+          = f.label :title do
+            %strong= "Title *"
+          .input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
+      .ui-box-body
+        .clearfix
+          .left
+            = f.label :assignee_id do
+              %i.icon-user
+              Assign to
+            .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'})
+          .left
+            = f.label :milestone_id do
+              %i.icon-time
+              Milestone
+            .input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
 
   .control-group
 
diff --git a/app/views/merge_requests/show/_commits.html.haml b/app/views/merge_requests/show/_commits.html.haml
index 796922776d9..671d9b84abf 100644
--- a/app/views/merge_requests/show/_commits.html.haml
+++ b/app/views/merge_requests/show/_commits.html.haml
@@ -1,6 +1,6 @@
 - if @commits.present?
   .ui-box
-    %h5
+    %h6.title
       %i.icon-list
       Commits (#{@commits.count})
     .merge-request-commits
diff --git a/app/views/merge_requests/show/_mr_box.html.haml b/app/views/merge_requests/show/_mr_box.html.haml
index cd33732d191..644d7fcc58e 100644
--- a/app/views/merge_requests/show/_mr_box.html.haml
+++ b/app/views/merge_requests/show/_mr_box.html.haml
@@ -1,5 +1,5 @@
-.main_box
-  .top_box_content
+.ui-box.ui-box-show
+  .ui-box-head
     %h4.box-title
       - if @merge_request.merged
         .error.status_info
@@ -9,7 +9,7 @@
         .error.status_info Closed
       = gfm escape_once(@merge_request.title)
 
-  .middle_box_content
+  .ui-box-body
     %div
       %cite.cgray
         Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}
@@ -22,7 +22,7 @@
 
 
   - if @merge_request.closed
-    .bottom_box_content
+    .ui-box-bottom
       - if @merge_request.merged?
         %span
           Merged by #{link_to_member(@project, @merge_request.merge_event.author)}