From ad36f761c1209380955924483fbe7cc8aff065eb Mon Sep 17 00:00:00 2001
From: Chris Rodriguez <github@chrisrodriguez.me>
Date: Mon, 8 Feb 2016 09:05:52 -0500
Subject: [PATCH 1/3] Hotfix: ac-201

---
 lms/static/sass/views/_learner-profile.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/static/sass/views/_learner-profile.scss b/lms/static/sass/views/_learner-profile.scss
index b7b1160a53..ac44ea3be7 100644
--- a/lms/static/sass/views/_learner-profile.scss
+++ b/lms/static/sass/views/_learner-profile.scss
@@ -91,7 +91,7 @@
 
             .upload-button-input {
                 position: absolute;
-                top: -($profile-image-dimension);
+                top: -($profile-image-dimension * 2);
                 @include left(0);
                 width: $profile-image-dimension;
                 height: 100%;

From ae279569db184944434e3bfc11a84f392305dfb2 Mon Sep 17 00:00:00 2001
From: Adam Palay <adampalay@gmail.com>
Date: Mon, 8 Feb 2016 07:54:09 -0500
Subject: [PATCH 2/3] address mathjax rendering bug (TNL-4080)

---
 common/lib/xmodule/xmodule/css/capa/display.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
index 131d094def..0a5bcc83d2 100644
--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -470,6 +470,11 @@ div.problem {
           border: 1px solid #e3e3e3;
           border-radius: 4px;
           background: #f1f1f1;
+
+          & span {
+            // Needed to fix mathjax rendering bug in chrome (TNL-4080)
+            border-left-style: none !important;
+          }
         }
       }
     }

From f3c20e73603dec62f87f4d95f23f22f132c9d684 Mon Sep 17 00:00:00 2001
From: Peter Fogg <pfogg@edx.org>
Date: Mon, 8 Feb 2016 11:05:38 -0500
Subject: [PATCH 3/3] Correctly add profile image to edX header.

---
 lms/static/sass/shared/_header.scss      | 5 +++--
 themes/edx.org/lms/templates/header.html | 9 ++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss
index d1dc31e846..4debdab20a 100644
--- a/lms/static/sass/shared/_header.scss
+++ b/lms/static/sass/shared/_header.scss
@@ -450,6 +450,7 @@ header.global-new {
 
   .user {
     @include float(right);
+    margin-top: 0;
 
     > .primary {
       display: block;
@@ -487,7 +488,7 @@ header.global-new {
       letter-spacing: 0;
 
       .user-image-frame {
-        max-width: ($baseline/2);
+        max-width: ($baseline*2);
         border-radius: 10%;
       }
 
@@ -507,7 +508,7 @@ header.global-new {
 
     .dropdown {
       font-size: $body-font-size;
-      padding: 0 ($baseline/2);
+      padding: ($baseline/5) ($baseline/2);
       color: $base-font-color;
       border: none;
       background: $white;
diff --git a/themes/edx.org/lms/templates/header.html b/themes/edx.org/lms/templates/header.html
index e80e048310..cca57f2896 100644
--- a/themes/edx.org/lms/templates/header.html
+++ b/themes/edx.org/lms/templates/header.html
@@ -9,6 +9,8 @@ from django.utils.translation import ugettext as _
 import branding
 # app that handles site status messages
 from status.status import get_site_status_msg
+
+from openedx.core.djangoapps.user_api.accounts.image_helpers import get_profile_image_urls_for_user
 %>
 
 ## Provide a hook for themes to inject branding on top.
@@ -76,7 +78,12 @@ site_status_msg = get_site_status_msg(course_id)
       <li class="primary">
         <a href="${reverse('dashboard')}" class="user-link">
           <span class="sr">${_("Dashboard for:")}</span>
-          <div>${user.username}</div>
+          <%
+          username = user.username
+          profile_image_url = get_profile_image_urls_for_user(user)['medium']
+          %>
+          <img class="user-image-frame" src="${profile_image_url}" alt="${_('Profile image for {username}').format(username=username)}">
+          <div class="label-username">${username}</div>
         </a>
       </li>
       <li class="primary">