From c3e07b6f9cc22bf0b89ab5b6af8bca70cd3d6366 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Mon, 29 Feb 2016 17:14:38 -0500
Subject: [PATCH] Move static icon and change appearance. MR meta details media
 queries.

---
 .../stylesheets/framework/issue_box.scss      | 10 +++++++--
 app/assets/stylesheets/pages/detail_page.scss |  1 +
 app/assets/stylesheets/pages/issues.scss      |  9 ++++++++
 .../merge_requests/show/_mr_title.html.haml   | 22 +++++++++----------
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/framework/issue_box.scss b/app/assets/stylesheets/framework/issue_box.scss
index 5d7fd36be16..2b72c249368 100644
--- a/app/assets/stylesheets/framework/issue_box.scss
+++ b/app/assets/stylesheets/framework/issue_box.scss
@@ -5,11 +5,17 @@
  */
 
 .status-box {
+  @media (max-width: $screen-sm-max) {
+        padding: 5px 11px;
+    margin-top: 4px;
+  }
+  @media (min-width: $screen-sm-min) {
+    padding: 0 $gl-btn-padding;
+    margin-top: 5px;
+  }
   @include border-radius(3px);
   display: block;
   float: left;
-  padding: 0 $gl-btn-padding;
-  margin-top: 5px;
   margin-right: 10px;
   color: #FFF;
   font-size: $gl-font-size;
diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss
index 787f0c8da0f..d3eda1a57e6 100644
--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
@@ -19,6 +19,7 @@
 
   .issue-meta {
     display: inline-block;
+    line-height: 20px;
   }
 }
 
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index e4a171ed4d5..2f014d5549f 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -133,3 +133,12 @@ form.edit-issue {
   color: $secondary-text;
   margin-left: 52px;
 }
+
+.editor-details {
+  @media (max-width: $screen-sm-max) {
+    display: block;
+  }
+  @media (min-width: $screen-sm-min) {
+    display: inline-block;
+  }
+}
\ No newline at end of file
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index de305fd1d0a..f0c49dc5bde 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -4,17 +4,17 @@
       = @merge_request.state_human_name
     %span.hidden-sm.hidden-md.hidden-lg
       =icon(@merge_request.state_icon_name)
-
-  %span.identifier
-    Merge Request #{@merge_request.to_reference}
-  %span.creator
-    &middot;
-    by 
-    =link_to_member(@project, @merge_request.author, size: 24, mobile_classes: "hidden-xs")
-    =link_to_member(@project, @merge_request.author, size: 24,
-      by_username: true, avatar: false)
-    &middot;
-    = time_ago_with_tooltip(@merge_request.created_at)
+  .issue-meta
+    %strong.identifier
+      Merge Request ##{@merge_request.iid}
+    %span.creator
+      by
+      .editor-details
+        %strong
+          =link_to_member(@project, @merge_request.author, size: 24, mobile_classes: "hidden-xs")
+          =link_to_member(@project, @merge_request.author, size: 24,
+            by_username: true, avatar: false)
+        = time_ago_with_tooltip(@merge_request.created_at)
 
   .issue-btn-group.pull-right
     - if can?(current_user, :update_merge_request, @merge_request)
-- 
GitLab