Download as
Browse Code »

Commit 8805ad424cd56e067dae9237af07a7860960b993

Authored by Sergio Oliveira
1 parent 5a512337
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Fixing user menu for xs interfaces

Showing 2 changed files with 12 additions and 8 deletions   Show diff stats
src/colab/deprecated/templates/base.html
  Diff comments   View file @8805ad4
@@ -84,13 +84,13 @@ @@ -84,13 +84,13 @@
84 <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li> 84 <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
85 <li>{% browserid_login text='Login' next=request.path %}</li> 85 <li>{% browserid_login text='Login' next=request.path %}</li>
86 {% else %} 86 {% else %}
87 - <li class="dropdown"> 87 + <li id="user-menu" class="dropdown">
88 <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a> 88 <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
89 <ul class="dropdown-menu" role="menu"> 89 <ul class="dropdown-menu" role="menu">
90 <li> 90 <li>
91 - <div class="user-menu"> 91 + <div class="wrapper">
92 <div class="thumbnail">{% gravatar user.email 100 %}</div> 92 <div class="thumbnail">{% gravatar user.email 100 %}</div>
93 - <div class="user-menu-info"> 93 + <div class="user-info">
94 <span><b>{{ user.get_full_name }}</b></span> 94 <span><b>{{ user.get_full_name }}</b></span>
95 <span class="quiet">{{ user.email }}</span> 95 <span class="quiet">{{ user.email }}</span>
96 </div> 96 </div>
src/colab/static/css/screen.css
  Diff comments   View file @8805ad4
@@ -22,26 +22,30 @@ body { @@ -22,26 +22,30 @@ body {
22 margin-left: 10px; 22 margin-left: 10px;
23 } 23 }
24 24
25 -.navbar .user-menu { 25 +#user-menu {
  26 + padding-right: 20px;
  27 +}
  28 +
  29 +#user-menu .wrapper {
26 padding: 10px; 30 padding: 10px;
27 white-space: nowrap; 31 white-space: nowrap;
28 } 32 }
29 33
30 -.navbar .user-menu a { 34 +#user-menu .wrapper a {
31 margin: 5px 0; 35 margin: 5px 0;
32 } 36 }
33 37
34 -.navbar .user-menu-info { 38 +#user-menu .user-info {
35 display: inline-block; 39 display: inline-block;
36 vertical-align: top; 40 vertical-align: top;
37 padding-left: 5px; 41 padding-left: 5px;
38 } 42 }
39 43
40 -.navbar .user-menu-info span { 44 +#user-menu .user-info span {
41 display: block; 45 display: block;
42 } 46 }
43 47
44 -.navbar .dropdown-menu .thumbnail { 48 +#user-menu .dropdown-menu .thumbnail {
45 width: 100px; 49 width: 100px;
46 display: inline-block; 50 display: inline-block;
47 } 51 }