From 7277983e08cd681a5573e14d2b8932f5f1938466 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Pasquier <contact@jbpasquier.eu>
Date: Fri, 24 Jan 2020 19:30:36 +0100
Subject: [PATCH 1/3] fix: left menu circle on widget

---
 src/menu-left.pug              | 16 ++++++++++++----
 src/styles/base/menu-left.scss |  6 +++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/menu-left.pug b/src/menu-left.pug
index 2dfa6a7..7189fb9 100644
--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@@ -55,16 +55,24 @@ nav#main__menu.jsLeftMenu
         div.menu-icon.icon-folder-alt
       sib-route(name='circle', rdf-type='hd:circle', use-id='', hidden)
       div.sub-menu.menu-notification
+        sib-widget(name='menu-circle-fix-url')
+          template
+            sib-display(
+              data-src='${value}'
+              fields='name, badge'
+              value-badge='${value}'
+              widget-badge='hd-counter'
+              widget-name='sib-display-div'
+              next='circle'
+            )
         sib-display(
           bind-user
           nested-field='circles'
-          fields='circle.name, circle'
+          fields='circle'
           empty-widget='hd-create'
           empty-value='circle'
-          widget-circle.name='sib-display-div'
-          widget-circle='hd-counter'
+          widget-circle='menu-circle-fix-url'
           order-by='circle.name'
-          next='circle'
         )
     div.divider
     div.menu-wrapper
diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss
index 1256a05..3699f40 100644
--- a/src/styles/base/menu-left.scss
+++ b/src/styles/base/menu-left.scss
@@ -157,7 +157,11 @@
       }
 
       &.menu-notification {
-        > sib-display > div > sib-display > div {
+        > sib-display > div > sib-display > div > menu-circle-fix-url {
+          flex: 1;
+        }
+        > sib-display > div > sib-display > div,
+        > sib-display > div > sib-display > div > menu-circle-fix-url  > sib-display > div {
             display: flex;
             sib-display-div {
               flex: 3;

From fb703e7246d919410fd8ef51510bc62a70cfa54b Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Pasquier <contact@jbpasquier.eu>
Date: Mon, 27 Jan 2020 13:18:28 +0100
Subject: [PATCH 2/3] fix: move next to parent

---
 src/menu-left.pug              | 2 +-
 src/styles/base/menu-left.scss | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/menu-left.pug b/src/menu-left.pug
index 7189fb9..d5c728c 100644
--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@@ -63,7 +63,6 @@ nav#main__menu.jsLeftMenu
               value-badge='${value}'
               widget-badge='hd-counter'
               widget-name='sib-display-div'
-              next='circle'
             )
         sib-display(
           bind-user
@@ -73,6 +72,7 @@ nav#main__menu.jsLeftMenu
           empty-value='circle'
           widget-circle='menu-circle-fix-url'
           order-by='circle.name'
+          next='circle'
         )
     div.divider
     div.menu-wrapper
diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss
index 3699f40..9f70564 100644
--- a/src/styles/base/menu-left.scss
+++ b/src/styles/base/menu-left.scss
@@ -149,7 +149,8 @@
           }
         }
 
-        &>sib-display[active]>div {
+        &>sib-display[active]>div,
+        &>sib-display>div>menu-circle-fix-url>sib-display[active]>div {
           background-color: $color-46-100-67;
           color: $color-233-18-29;
           font-weight: bold;

From 9562289e53eb70a37ab4b859077ad6b3605ce129 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Pasquier <contact@jbpasquier.eu>
Date: Mon, 27 Jan 2020 13:29:54 +0100
Subject: [PATCH 3/3] fix: css for left menu

---
 src/menu-left.pug              |  2 +-
 src/styles/base/menu-left.scss | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/menu-left.pug b/src/menu-left.pug
index d5c728c..cdf6b9d 100644
--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@@ -83,7 +83,7 @@ nav#main__menu.jsLeftMenu
         div.menu-icon.icon-envelope-letter
       sib-route(name='messages', rdf-type='foaf:user', use-id='', hidden)
       div.sub-menu.menu-notification
-        sib-display(
+        sib-display.nosub(
           data-src=`${endpoints.users}`
           fields='username, badge'
           widget-username='sib-display-div'
diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss
index 9f70564..8ffd616 100644
--- a/src/styles/base/menu-left.scss
+++ b/src/styles/base/menu-left.scss
@@ -124,7 +124,11 @@
         }
       }
       /* End of specific styles of "Projects" tab */
-      
+
+      >sib-display.nosub>div>sib-display>div {
+        padding: 1rem 1rem 1rem 3.2rem;
+      }
+
       sib-display>div {
 
         .create {
@@ -141,7 +145,9 @@
           >div {
             color: $color-244-10-70;
             cursor: pointer;
-            padding: 1rem 1rem 1rem 3.2rem;
+            >menu-circle-fix-url>sib-display>div {
+              padding: 1rem 1rem 1rem 3.2rem;
+            }
           }
 
           &[fields="project(customer.name, name), badge"]>div {