Merge branch 'affix-assignee' into 'master'

Affix milestone/assignee UI element

See merge request !1536

app/assets/javascripts/issue.js.coffee

@@ -15,3 +15,9 @@ class @Issue
       "issue"
       updateTaskState
     )
+
+    $('.issuable-affix').affix offset:
+      top: ->
+        @top = $('.issue-details').outerHeight(true) + 25
+      bottom: ->
+        @bottom = $('.footer').outerHeight(true)

app/assets/javascripts/merge_request.js.coffee

@@ -20,6 +20,12 @@ class @MergeRequest
     if $("a.btn-close").length
       $("li.task-list-item input:checkbox").prop("disabled", false)
 
+    $('.issuable-affix').affix offset:
+      top: ->
+        @top = $('.merge-request-details').outerHeight(true) + 70
+      bottom: ->
+        @bottom = $('.footer').outerHeight(true)
+
   # Local jQuery finder
   $: (selector) ->
     this.$el.find(selector)

app/assets/stylesheets/sections/issuable.scss

+@media (max-width: $screen-sm-max) {
+  .issuable-affix {
+    margin-top: 20px;
+  }
+}
+
+@media (max-width: $screen-md-max) {
+  .issuable-affix {
+    position: static;
+  }
+}
+
+@media (min-width: $screen-md-max) {
+  .issuable-affix {
+    &.affix-top {
+      position: static;
+    }
+
+    &.affix {
+      position: fixed;
+      top: 70px;
+      width: 220px;
+    }
+  }
+}

app/assets/stylesheets/sections/issues.scss

@@ -94,8 +94,15 @@
   }
 }
 
-.issue-show-labels .color-label {
+.issue-show-labels {
+  a {
+    margin-right: 5px;
+    margin-bottom: 5px;
+    display: inline-block;
+    .color-label {
       padding: 6px 10px;
+    }
+  }
 }
 
 form.edit-issue {

app/assets/stylesheets/sections/merge_requests.scss

@@ -95,7 +95,14 @@
       color: #999;
 
       .merge-request-labels {
+        a {
+          margin-right: 5px;
+          margin-bottom: 5px;
           display: inline-block;
+          .color-label {
+            padding: 6px 10px;
+          }
+        }
       }
     }
   }

app/views/projects/issues/_discussion.html.haml

@@ -14,7 +14,7 @@
 
     .voting_notes#notes= render "projects/notes/notes_with_form"
   .col-md-3
-    %div
+    .issuable-affix
       .clearfix
         %span.slead.has_tooltip{:"data-original-title" => 'Cross-project reference'}
           = cross_project_reference(@project, @issue)
@@ -34,4 +34,4 @@
         .issue-show-labels
           - @issue.labels.each do |label|
             = link_to project_issues_path(@project, label_name: label.name) do
-            %p= render_colored_label(label)
+              = render_colored_label(label)

app/views/projects/issues/show.html.haml

-%h4.page-title
+.issue
+  .issue-details
+    %h4.page-title
       .issue-box{ class: issue_box_class(@issue) }
         - if @issue.closed?
           Closed
@@ -23,15 +25,16 @@
             %i.fa.fa-pencil-square-o
             Edit
 
-%hr
-%h3.issue-title
+    %hr
+    %h3.issue-title
       = gfm escape_once(@issue.title)
-%div
+    %div
       - if @issue.description.present?
         .description
           .wiki
             = preserve do
               = markdown(@issue.description, parse_tasks: true)
 
-%hr
-= render "projects/issues/discussion"
+    %hr
+  .issue-discussion
+    = render "projects/issues/discussion"

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

@@ -10,6 +10,7 @@
     = render "projects/merge_requests/show/participants"
     = render "projects/notes/notes_with_form"
   .col-md-3
+    .issuable-affix
       .clearfix
         %span.slead.has_tooltip{:"data-original-title" => 'Cross-project reference'}
           = cross_project_reference(@project, @merge_request)
@@ -28,4 +29,4 @@
         .merge-request-show-labels
           - @merge_request.labels.each do |label|
             = link_to project_merge_requests_path(@project, label_name: label.name) do
-            %p= render_colored_label(label)
+              = render_colored_label(label)

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

 .merge-request{'data-url' => project_merge_request_path(@project, @merge_request)}
+  .merge-request-details
     = render "projects/merge_requests/show/mr_title"
     %hr
     = render "projects/merge_requests/show/mr_box"