Merge branch 'ui-fixes' into 'master'

Ui fixes

* Fix merge request widget UI
* Improve jquery UI
* truncate long branch names on MR index

app/assets/stylesheets/generic/jquery.scss

@@ -8,7 +8,7 @@
     width: 270px;
 
     .ui-datepicker-header {
-      background: #EEE;
+      background: #FFF;
       border-color: #DDD;
     }
 
@@ -19,20 +19,37 @@
   }
 
   &.ui-autocomplete {
-    @include border-radius(0px);
     border-color: #DDD;
     padding: 0;
+    margin-top: 2px;
+    z-index: 1001;
 
     .ui-menu-item a {
+      padding: 4px 10px;
+    }
+  }
+
+  .ui-state-default {
+    border: 1px solid #FFF;
+    background: #FFF;
     color: #777;
+  }
 
-      &:hover {
-        background: $hover;
-        border-color: $primary_color;
-        @include border-radius(0px);
-        color: #333;
+  .ui-state-highlight {
+    border: 1px solid #EEE;
+    background: #EEE;
   }
+
+  .ui-state-active {
+    border: 1px solid $bg_style_color;
+    background: $bg_style_color;
+    color: #FFF;
   }
+
+  .ui-state-hover,
+  .ui-state-focus {
+    border: 1px solid $hover;
+    background: $hover;
+    color: #333;
   }
 }
-

app/assets/stylesheets/sections/issues.scss

@@ -45,14 +45,6 @@
   padding: 6px 10px;
   border: 1px solid #ccc;
   @include border-radius(4px);
-
-
-  input.check_all_issues {
-    padding: 0;
-    margin: 0;
-    position: relative;
-    top: 3px;
-  }
 }
 
 .issues_content {

app/views/projects/merge_requests/_merge_request.html.haml

@@ -11,11 +11,7 @@
         - if merge_request.for_fork?
           %span.light
             #{merge_request.source_project_namespace}:
-          = merge_request.source_branch
-          %i.icon-angle-right.light
-          = merge_request.target_branch
-        - else
-          = merge_request.source_branch
+        = truncate merge_request.source_branch, length: 25
         %i.icon-angle-right.light
         = merge_request.target_branch
   .merge-request-info

app/views/projects/merge_requests/show/_state_widget.html.haml

@@ -21,14 +21,6 @@
         #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
       = render "projects/merge_requests/show/remove_source_branch"
 
-    - if !@closes_issues.empty? && @merge_request.open?
-      .alert.alert-info.alert-info
-        %span
-          %i.icon-ok
-          Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
-          = succeed '.' do
-            != gfm(@closes_issues.map { |i| "##{i.iid}" }.to_sentence)
-
     - unless @commits.any?
       %h4 Nothing to merge
       %p
@@ -38,3 +30,12 @@
         %span.label-branch #{@merge_request.target_branch}
         %br
         Try to use different branches or push new code.
+
+  - if !@closes_issues.empty? && @merge_request.open?
+    .panel-footer
+      %span
+        %i.icon-ok
+        Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
+        = succeed '.' do
+          != gfm(@closes_issues.map { |i| "##{i.iid}" }.to_sentence)
+