entrouvert
/
gadjo
15
0
Fork 0
Code Issues Pull Requests 3 Releases Activity

include platform name in header

This commit is contained in:
Frédéric Péters 2018-03-07 18:29:02 +01:00
parent 319253eda8
commit b7ecd3eaad
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gadjo/static/css/gadjo.scss
View File

@ -101,6 +101,7 @@ div#top a {
}
ul.user-info {
box-sizing: border-box;
margin: 0;
padding: 0;
padding-right: 3em;
@ -112,13 +113,13 @@ ul.user-info {
z-index: 10;
background: $secondary-color;
background: var(--secondary-color);
height: $header-height;
line-height: $header-height;
li {
display: inline-block;
vertical-align: middle;
padding-left: 1em;
color: white;
height: $header-height;
line-height: $header-height;
}
a {
color: white;
@ -149,6 +150,12 @@ ul.user-info {
content: "\f05c"; // times-circle-o
}
}
.ui-platform-name {
background: white;
color: black;
padding: 0 2em;
text-transform: uppercase;
}
}
/* header */
@ -159,7 +166,6 @@ div#header {
background: $primary-color;
background: var(--primary-color);
padding-left: 0px;
border-bottom: 1px solid #888;
position: relative;
height: $header-height;
}
@ -819,11 +825,11 @@ body.sidepage-expanded #sidepage {
position: relative;
overflow: hidden;
@include vendor-prefix('transition', 'max-width 0ms ease-in');
height: $header-height + 1px;
height: $header-height;
line-height: $header-height;
font-weight: normal;
font-size: 20px;
border-bottom: 1px solid #888;
border-bottom: 1px solid #7F8F9E;
background: white;
box-sizing: border-box;
width: calc(36px + #{$sidepage-width});

3
gadjo/templates/gadjo/root.html
View File

@ -29,6 +29,9 @@
{% endblock %}
{% block user-links %}
<ul class="user-info">
{% if global_title %}
<li class="ui-platform-name">{{ global_title }}</li>
{% endif %}
{% if user.is_authenticated %}
<li class="ui-avatar">{% firstof request.session.mellon_session.avatar.0 user.get_full_name|slice:":1" %}</li>
<li class="ui-name">{{ user.get_full_name }}</li>