This commit is contained in:
Frédéric Péters 2018-03-07 09:15:34 +01:00
parent 654a8ffe16
commit 319253eda8
3 changed files with 55 additions and 31 deletions

View File

@ -10,16 +10,13 @@ $header-height: 60px;
// bleus
$primary-color: #4E7EE2;
$secondary-color: #00D6EB;
$primary-color: #4e7ee2; $secondary-color: #00d6eb;
// rouge/orange
$primary-color: #ff375e;
$secondary-color: #ff5a47;
//$primary-color: #ff375e; $secondary-color: #ff5a47;
// violet/rose
$primary-color: #6f2b92;
$secondary-color: #e72588;
//$primary-color: #6f2b92; $secondary-color: #e72588;
:root {
--primary-color: #{$primary-color};
@ -120,12 +117,29 @@ ul.user-info {
li {
display: inline-block;
vertical-align: middle;
padding-left: 3em;
padding-left: 1em;
color: white;
}
a {
color: white;
}
.ui-help {
padding-left: 3em;
}
.ui-avatar {
color: $primary-color;
vertical-align: middle;
font-size: $header-height * 0.35;
background: white;
border-radius: $header-height * 0.6 / 2;
height: $header-height * 0.6;
width: $header-height * 0.6;
line-height: $header-height * 0.6;
display: inline-block;
text-align: center;
padding: 0;
margin-left: 1em;
}
.ui-logout {
padding-left: 1rem;
font-size: 150%;
@ -156,8 +170,7 @@ div#header h1 {
padding: 0 0 0 230px;
margin: 0;
font-weight: normal;
color: black;
text-shadow: 0 0 2px white;
color: white;
display: inline-block;
z-index: 100;
max-width: 80%;
@ -167,9 +180,9 @@ div#header h1 {
overflow: hidden;
text-overflow: ellipsis;
@include vendor-prefix('transition', 'all ease 200ms');
opacity: 0.5;
a {
opacity: 0.8;
color: inherit;
border-bottom: none;
display: inline-block;
@ -182,13 +195,8 @@ div#header h1 {
}
}
&:hover {
opacity: 0.7;
}
a:hover {
opacity: 1;
text-shadow: 0 0 0px #333;
}
}
@ -726,7 +734,7 @@ ul.objects-list li span.badge {
box-sizing: border-box;
border-radius: 1ex;
padding: 0 1ex;
background: #ad7c6d;
background: $secondary-color;
color: white;
line-height: 2em;
}
@ -861,14 +869,23 @@ body.sidepage-expanded #sidepage span#applabel {
height: 100%;
top: 0px;
}
}
#sidepage ul#sidepage-menu a {
border: none;
display: block;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
li {
@include vendor-prefix('transition', 'all 200ms ease');
a {
@include vendor-prefix('transition', 'all 200ms ease');
}
}
li a {
border: none;
display: block;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
color: $primary-color;
}
li:hover a {
color: white;
}
}
#sidepage ul#sidepage-menu li {
@ -962,10 +979,18 @@ div.old-ie-warning p {
line-height: 150%;
}
$string-color: str-slice($primary-color + '', 2);
$appicons: add, announces, book, calendar, categories, clock, counter, facturier, forms, gis, grid, home, mail, management, organizational-units, passerelle, password, phone, portal, portal-agent, porte-doc, roles, security, services, settings, statistics, submission, system, texts, theme, users, workflows;
$colors: "4e7ee2", "ff375e", "6f2b92";
@each $appicon in $appicons {
ul#sidepage-menu li a.icon-#{$appicon} { background-image: url(icons/#{$appicon}.small.png); }
ul#sidepage-menu li a.icon-#{$appicon} { background-image: url(icons/#{$appicon}.small.#{$string-color}.png); }
ul#sidepage-menu li.active a.icon-#{$appicon} { background-image: url(icons/#{$appicon}.small.white.png); }
@each $color in $colors {
body.s#{$color} ul#sidepage-menu li a.icon-#{$appicon} { background-image: url(icons/#{$appicon}.small.#{$color}.png); }
}
ul#sidepage-menu li a.icon-#{$appicon} { background-image: url(icons/#{$appicon}.small.#{$string-color}.png); }
ul.apps li.icon-#{$appicon} a { background-image: url(icons/#{$appicon}.large.png); }
ul.apps li.icon-#{$appicon} a:hover { background-image: url(icons/#{$appicon}.large-hover.png); }
}
@ -1070,7 +1095,7 @@ div.section {
color: #444;
background: white;
border-bottom: 1px solid transparent;
padding: 1rem 1rem 0 1rem;
padding: 1rem 1rem 0rem 1rem;
margin-top: 0;
margin-bottom: 0;
}
@ -1102,6 +1127,7 @@ div.section {
&.folded {
> h2, > h3 {
border-bottom: none;
padding-bottom: 1rem;
&::after {
transform: rotate(-90deg);
}
@ -1119,9 +1145,6 @@ div.section {
color: #444;
}
.ui-logout a::before {
content: "x";
}
@import 'grid';
@import 'jqueryui';

View File

@ -30,6 +30,7 @@
{% block user-links %}
<ul class="user-info">
{% 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>
<li class="ui-logout"><a href="{% block logout-url %}index.html{% endblock %}"
title="{% trans "Logout" %}"></a></li>

View File

@ -134,8 +134,8 @@ class build_icons(Command):
variants = {
'small': {'colour': 'e7e7e7', 'width': '20',
'css': 'ul#sidepage-menu li a.icon-%(name)s { background-image: url(icons/%(filename)s); }'},
'small.4e7ee2': {'colour': '4e7ee2', 'width': '20',
'css': 'ul#sidepage-menu li a.icon-%(name)s { background-image: url(icons/%(name)s.small.#{$string-color}.png); }'},
'small.white': {'colour': 'ffffff', 'width': '20'},
'small.4e7ee2': {'colour': '4e7ee2', 'width': '20'},
'small.ff375e': {'colour': 'ff375e', 'width': '20'},
'small.6f2b92': {'colour': '6f2b92', 'width': '20'},
'large': {'colour': 'e7e7e7', 'width': '80',