Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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)
This commit is contained in:
Waseem Daher 2013-03-02 20:39:47 -05:00
parent 6632d84f0b
commit 812fce0534
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
templates/zephyr/left-sidebar.html
View File

@ -1,12 +1,15 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span3 sidebar-nav affix" id="left-sidebar"> <div class="span3 sidebar-nav affix" id="left-sidebar">
<div class="upper_sidebar"> <div class="upper_sidebar">
<span class="brand" id="my_information"> <div class="brand">
<img class="img-rounded gravatar-profile" <img class="img-rounded gravatar-profile"
src="https://secure.gravatar.com/avatar/{{ email_hash }}?d=identicon&s=60" /> src="https://secure.gravatar.com/avatar/{{ email_hash }}?d=identicon&s=60" />
<span class="my_fullname">{{ user_profile.full_name }}</span> <span id="my_information">
<span class="my_email">{{ user_profile.user.email }}</span> <span class="my_fullname">{{ user_profile.full_name }}</span><br />
</span> <span class="my_email">{{ user_profile.user.email }}</span>
</span>
</div>
<div class="new_message_button"> <div class="new_message_button">
<button type="button" class="btn btn-large" <button type="button" class="btn btn-large"
id="left_bar_compose_stream_button_big" id="left_bar_compose_stream_button_big"

26
zephyr/static/styles/zephyr.css
View File

@ -118,26 +118,28 @@ a:hover code {
} }
} }
#left-sidebar .brand {
display: table-row;
}
#left-sidebar .gravatar-profile {
display: table-cell;
}
#my_information { #my_information {
cursor: pointer; display: table-cell;
vertical-align: middle;
padding-left: 0.5em;
} }
.my_fullname { .my_fullname {
font-weight: bold; font-weight: bold;
font-size: 150%;
white-space: nowrap; white-space: nowrap;
} }
.my_email { .my_email {
color: grey; color: grey;
} }
@media (max-width: 767px) {
.my_fullname {
font-size: 100%;
}
.my_email {
font-size: 80%;
}
}
.logout { .logout {
white-space: nowrap; white-space: nowrap;
@ -604,6 +606,10 @@ input.recipient_box {
height: 40px; height: 40px;
} }
.brand {
cursor: pointer;
}
.brand.skinny-user-gravatar { .brand.skinny-user-gravatar {
padding-top: 5px; padding-top: 5px;
padding-bottom: 0px; padding-bottom: 0px;