haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-21 03:18:23 +00:00
Code Issues Releases Wiki Activity

improved topbar

Browse Source
This commit is contained in:
llj
2013-06-26 16:26:04 +08:00
parent b37812cc6e
commit 7b786bdf6f
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
media/css/seahub.css
View File

@@ -521,6 +521,9 @@ textarea:-moz-placeholder {/* for FF */
margin:0 auto; margin:0 auto;
position:relative; position:relative;
} }
.top-bar-con .account {
text-align:right;
}
#send-msg-popup { #send-msg-popup {
width:320px; width:320px;
padding:15px; padding:15px;
@@ -539,18 +542,25 @@ textarea:-moz-placeholder {/* for FF */
line-height:24px; line-height:24px;
color:#ddd; color:#ddd;
font-weight:normal; font-weight:normal;
vertical-align:middle;
} }
.top-bar-con .my-info { .top-bar-con .my-info {
color:#fff; color:#fff;
font-weight:bold;
vertical-align:middle;
display:inline-block;
padding-right:7px; padding-right:7px;
height:16px;
line-height:16px;
border-right:1px solid #aaa; border-right:1px solid #aaa;
margin-right:3px; margin-right:3px;
} }
.top-bar-con button { .top-bar-con .btn {
padding:0 6px; padding:0 6px;
border-radius:2px; border-radius:2px;
line-height:16px; line-height:16px;
margin-right:2px; margin-right:2px;
vertical-align:middle;
} }
#add-msg.add-msg-hl { #add-msg.add-msg-hl {
background:#fff; background:#fff;
@@ -561,9 +571,7 @@ textarea:-moz-placeholder {/* for FF */
} }
.top-bar-con .avatar-link { .top-bar-con .avatar-link {
height:16px; height:16px;
vertical-align:middle; line-height:16px;
margin-bottom:2px;
*margin-bottom:0;/*for ie 7*/
} }
.top-bar-con .avatar { .top-bar-con .avatar {
border-radius: 2px; border-radius: 2px;

2
media/js/base.js
View File

@@ -1,4 +1,4 @@
$('.top-bar-con .manage').css('width', $('.top-bar-con').width() - $('.top-bar-con .account').width() - 30); $('.top-bar-con .account').css('margin-left', $('.top-bar-con .manage').width() + 10);
$('#title-panel, #left-panel, #right-panel').each(function() { // for ie 7 $('#title-panel, #left-panel, #right-panel').each(function() { // for ie 7
if ($(this).children().length == 0) { if ($(this).children().length == 0) {
$(this).addClass('hide'); $(this).addClass('hide');

8
seahub/templates/base.html
View File

@@ -40,11 +40,11 @@
{% endif %} {% endif %}
</div> </div>
<div class="account fright"> <div class="account">
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<span class="my-info"><a href="{% url 'edit_profile' %}" class="top-link avatar-link" title="{% trans 'Profile Setting' %}">{% avatar request.user 16 %}</a> <span class="bold">{{ request.user }}</span></span> <a href="{% url 'edit_profile' %}" class="top-link avatar-link" title="{% trans 'Profile Setting' %}">{% avatar request.user 16 %}</a> <span class="my-info">{{ request.user }}</span>
<button class="icon-envelope" id="add-msg" title="{% trans "send a message" %}"></button> <button class="icon-envelope btn" id="add-msg" title="{% trans "send a message" %}"></button>
<button data-url="{% url 'message_list' %}" id="msg-count" title="{% trans "unread messages" %}">0</button> <button class="btn" data-url="{% url 'message_list' %}" id="msg-count" title="{% trans "unread messages" %}">0</button>
<a href="{{ SITE_ROOT }}accounts/logout/" class="top-link">{% trans "Log out" %}</a> <a href="{{ SITE_ROOT }}accounts/logout/" class="top-link">{% trans "Log out" %}</a>
{% else %} {% else %}
<a href="{{ SITE_ROOT }}accounts/login/" class="top-link">{% trans "Log In" %}</a> <a href="{{ SITE_ROOT }}accounts/login/" class="top-link">{% trans "Log In" %}</a>