From 812fce0534018e6c8337a965c482f4618ba20590 Mon Sep 17 00:00:00 2001
From: Waseem Daher <wdaher@humbughq.com>
Date: Sat, 2 Mar 2013 20:39:47 -0500
Subject: [PATCH] More nicely align your name and email in the sidebar.

It's not quite what the CUSTOMER4 person wanted, but
I think it scratches the itch.

This fixes Trac #1023

(imported from commit 9186499c8f6bacb230a2d1ed6d5ca7ffa7416ac3)
---
 templates/zephyr/left-sidebar.html | 11 +++++++----
 zephyr/static/styles/zephyr.css    | 26 ++++++++++++++++----------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/templates/zephyr/left-sidebar.html b/templates/zephyr/left-sidebar.html
index 9f3085c0c2..c4b42a9b3f 100644
--- a/templates/zephyr/left-sidebar.html
+++ b/templates/zephyr/left-sidebar.html
@@ -1,12 +1,15 @@
           <div class="row-fluid">
             <div class="span3 sidebar-nav affix" id="left-sidebar">
               <div class="upper_sidebar">
-                  <span class="brand" id="my_information">
+                  <div class="brand">
                     <img class="img-rounded gravatar-profile"
                          src="https://secure.gravatar.com/avatar/{{ email_hash }}?d=identicon&s=60" />
-                    <span class="my_fullname">{{ user_profile.full_name }}</span>
-                    <span class="my_email">{{ user_profile.user.email }}</span>
-                  </span>
+                    <span id="my_information">
+                      <span class="my_fullname">{{ user_profile.full_name }}</span><br />
+                      <span class="my_email">{{ user_profile.user.email }}</span>
+                    </span>
+                  </div>
+
                   <div class="new_message_button">
                     <button type="button" class="btn btn-large"
                             id="left_bar_compose_stream_button_big"
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 7152ce8f77..3a006f95e8 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -118,26 +118,28 @@ a:hover code {
     }
 }
 
+#left-sidebar .brand {
+    display: table-row;
+}
+
+#left-sidebar .gravatar-profile {
+    display: table-cell;
+}
+
 #my_information {
-    cursor: pointer;
+    display: table-cell;
+    vertical-align: middle;
+    padding-left: 0.5em;
 }
 
 .my_fullname {
     font-weight: bold;
-    font-size: 150%;
     white-space: nowrap;
 }
 .my_email {
     color: grey;
 }
-@media (max-width: 767px) {
-    .my_fullname {
-        font-size: 100%;
-    }
-    .my_email {
-        font-size: 80%;
-    }
-}
+
 
 .logout {
     white-space: nowrap;
@@ -604,6 +606,10 @@ input.recipient_box {
     height: 40px;
 }
 
+.brand {
+    cursor: pointer;
+}
+
 .brand.skinny-user-gravatar {
     padding-top: 5px;
     padding-bottom: 0px;