From 968df8c186f2923690ce63dc06f82165b90db469 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaadmahmood@users.noreply.github.com>
Date: Tue, 30 Aug 2016 16:47:41 +0500
Subject: [PATCH] PLT-3916 - Fixing flag icon position in the RHS (#3898)

---
 webapp/components/rhs_comment.jsx      | 2 +-
 webapp/components/rhs_root_post.jsx    | 2 +-
 webapp/sass/layout/_sidebar-right.scss | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx
index dcd5ee37f5..1114d6fa11 100644
--- a/webapp/components/rhs_comment.jsx
+++ b/webapp/components/rhs_comment.jsx
@@ -392,7 +392,7 @@ export default class RhsComment extends React.Component {
                                     <FormattedDate
                                         value={post.create_at}
                                         day='numeric'
-                                        month='long'
+                                        month='short'
                                         year='numeric'
                                         hour12={!this.props.useMilitaryTime}
                                         hour='2-digit'
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx
index ea0c71cc78..09ab17ba54 100644
--- a/webapp/components/rhs_root_post.jsx
+++ b/webapp/components/rhs_root_post.jsx
@@ -359,7 +359,7 @@ export default class RhsRootPost extends React.Component {
                                     <FormattedDate
                                         value={post.create_at}
                                         day='numeric'
-                                        month='long'
+                                        month='short'
                                         year='numeric'
                                         hour12={!this.props.useMilitaryTime}
                                         hour='2-digit'
diff --git a/webapp/sass/layout/_sidebar-right.scss b/webapp/sass/layout/_sidebar-right.scss
index d43ddf5b94..a70c30b16f 100644
--- a/webapp/sass/layout/_sidebar-right.scss
+++ b/webapp/sass/layout/_sidebar-right.scss
@@ -40,9 +40,13 @@
         .post__header {
             .col__name {
                 .user-popover {
-                    max-width: 130px;
+                    max-width: 120px;
                 }
             }
+
+            .flag-icon__container {
+                z-index: 5;
+            }
         }
     }