bo next

gadjo/static/css/gadjo.scss

@@ -9,12 +9,21 @@ $sidepage-width: 16rem;
 $header-height: 60px;
 
 
+// bleus
 $primary-color: #4E7EE2;
 $secondary-color: #00D6EB;
 
+// rouge/orange
+$primary-color: #ff375e;
+$secondary-color: #ff5a47;
+
+// violet/rose
+$primary-color: #6f2b92;
+$secondary-color: #e72588;
+
 :root {
-	--primary-color: $primary-color;
-	--secondary-color: $secondary-color;
+	--primary-color: #{$primary-color};
+	--secondary-color: #{$secondary-color};
 }
 
 /* generalities */
@@ -87,12 +96,10 @@ span.warning {
 /* top bar */
 
 div#top {
-	color: #eee;
 	height: 0px;
 }
 
 div#top a {
-	font-weight: normal;
 	border: 0;
 }
 
@@ -100,7 +107,7 @@ ul.user-info {
 	margin: 0;
 	padding: 0;
 	padding-right: 3em;
-	font-size: 85%;
+	font-size: 100%;
 	font-weight: bold;
 	position: absolute;
 	top: 0px;
@@ -111,12 +118,23 @@ ul.user-info {
 	height: $header-height;
 	line-height: $header-height;
 	li {
-		display: inline;
+		display: inline-block;
+		vertical-align: middle;
 		padding-left: 3em;
+		color: white;
 	}
 	a {
 		color: white;
 	}
+	.ui-logout {
+		padding-left: 1rem;
+		font-size: 150%;
+		a::before {
+			font-family: FontAwesome;
+			font-weight: normal;
+			content: "\f05c";  // times-circle-o
+		}
+	}
 }
 
 /* header */
@@ -135,7 +153,7 @@ div#header {
 div#header h1 {
 	height: $header-height;
 	line-height: $header-height;
-	padding: 0 0 0 56px;
+	padding: 0 0 0 230px;
 	margin: 0;
 	font-weight: normal;
 	color: black;
@@ -186,8 +204,8 @@ div#header h1.breadcrumbs {
 
 	a::after {
 		content: "";
-		height: 42px;
-		width: 42px;
+		height: $header-height + 2px;
+		width: $header-height + 2px;
 		@include vendor-prefix('transform', 'scale(0.4, 0.707) rotate(45deg)');
 		display: inline-block;
 		position: absolute;
@@ -738,7 +756,6 @@ input[type=submit]:hover {
 	overflow: initial;
 	color: white;
 	li a {
-		filter: invert(70%);
 	}
 }
 
@@ -869,39 +886,10 @@ ul#sidepage-menu li a {
 	filter: none;
 }
 
+#sidepage ul#sidepage-menu li:hover,
 #sidepage ul#sidepage-menu li.active,
 #sidepage ul#sidepage-menu li.active:hover {
-	background: #215D9C;
-}
-
-#sidepage ul#sidepage-menu li:after {
-	background: rgba(0, 0, 0, 0.3);
-	content: "";
-	position: absolute;
-	z-index: -1;
-	@include vendor-prefix('transition', 'all 0.2s ease');
-	box-sizing: border-box;
-	width: 0;
-	width: 0%; height: 100%; top: 0; left: 0;
-}
-
-#sidepage ul#sidepage-menu li:hover:after {
-	width: 100%;
-	height: 100%;
-}
-
-#sidepage ul#sidepage-menu li.active:after {
-	content: "";
-	position: absolute;
-	display: block;
-	top: 0;
-	background: white;
-	z-index: 5;
-	right: -17px;
-	left: auto;
-	width: 34px;
-	height: 34px;
-	@include vendor-prefix('transform', 'scale(0.2, 0.2) rotate(45deg)');
+	background: $secondary-color;
 }
 
 @media screen and (max-width: $mobile-limit) {
@@ -1073,14 +1061,16 @@ $appicons: add, announces, book, calendar, categories, clock, counter, facturier
 
 div.section {
 	margin: 1em 0;
-	border: 1px solid #bcbcbc;
+	border: 1px solid transparent;
+	border-radius: 3px;
+	background: white;
 	> h2, > h3 {
 		font-weight: normal;
 		font-size: 120%;
 		color: #444;
-		background: #FCFCFC;
-		border-bottom: 1px solid #bcbcbc;
-		padding: 1rem;
+		background: white;
+		border-bottom: 1px solid transparent;
+		padding: 1rem 1rem 0 1rem;
 		margin-top: 0;
 		margin-bottom: 0;
 	}
@@ -1122,7 +1112,6 @@ div.section {
 		}
 	}
 	> div > ul.objects-list:first-child:last-child { // single child
-		margin: calc(-1rem - 1px);
 	}
 }
 
@@ -1130,6 +1119,10 @@ div.section {
 	color: #444;
 }
 
+.ui-logout a::before {
+	content: "x";
+}
+
 @import 'grid';
 @import 'jqueryui';
 @import 'forms';

gadjo/static/js/gadjo.js

@@ -371,6 +371,7 @@ var gadjo_js = gadjo_js || {};
           var timestamp = ((new Date().getTime() / 1000) % 86400 ) / (86400 / 440);
           $('div#header').css('background-position', '0 -' + timestamp + 'px');
 
+          return;
           var primary_night = [78, 126, 226];
           var secondary_night = [0, 214, 235];
           var primary_noon = [255, 55, 94];

gadjo/templates/gadjo/root.html

@@ -31,7 +31,8 @@
     <ul class="user-info">
       {% if user.is_authenticated %}
         <li class="ui-name">{{ user.get_full_name }}</li>
-        <li class="ui-logout"><a href="{% block logout-url %}index.html{% endblock %}">{% trans "Logout" %}</a></li>
+        <li class="ui-logout"><a href="{% block logout-url %}index.html{% endblock %}"
+                                 title="{% trans "Logout" %}"></a></li>
       {% endif %}
       {% block help-link %}
       {% endblock %}

setup.py

@@ -134,6 +134,10 @@ 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.ff375e': {'colour': 'ff375e', 'width': '20'},
+            'small.6f2b92': {'colour': '6f2b92', 'width': '20'},
             'large': {'colour': 'e7e7e7', 'width': '80',
                 'css': 'ul.apps li.icon-%(name)s a { background-image: url(icons/%(filename)s); }'},
             'large-hover': {'colour': 'bebebe', 'width': '80',
@@ -151,7 +155,7 @@ class build_icons(Command):
                     css = variants.get(variant).get('css')
                     if css:
                         css_rules.append(css % {'name': basename, 'filename': dest_filename})
-        #print '\n'.join(sorted(css_rules))
+        print '\n'.join(sorted(css_rules))
 
     def generate(self, src, dest, colour, width, **kwargs):
         if os.path.exists(dest) and os.stat(dest).st_mtime >= os.stat(src).st_mtime: