From 89cff3c541882bcb3a95e39278d11af1b5608e48 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 25 Nov 2019 17:33:56 +0100
Subject: [PATCH 1/4] Remove invisible title in usergrid

---
 www/common/common-ui-elements.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index a4d1345f6..db1083acf 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -789,7 +789,7 @@ define([
         });
 
         var div = h('div.cp-usergrid-container' + noOthers, [
-            h('label', label),
+            label ? h('label', label) : undefined,
             h('div.cp-usergrid-filter', (config.noFilter || config.noSelect) ? undefined : [
                 inputFilter,
                 buttonSelect,

From bf6681c5e6e3452ba92538c2cff49e9b3c82f1a9 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 25 Nov 2019 17:43:55 +0100
Subject: [PATCH 2/4] Better spacing between items in usergrid

---
 customize.dist/src/less2/include/usergrid.less | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/customize.dist/src/less2/include/usergrid.less b/customize.dist/src/less2/include/usergrid.less
index 38202de86..19c3d1d3a 100644
--- a/customize.dist/src/less2/include/usergrid.less
+++ b/customize.dist/src/less2/include/usergrid.less
@@ -10,6 +10,7 @@
         .cp-usergrid-grid {
             display: flex;
             flex-wrap: wrap;
+            margin: -3px;
             margin-bottom: 6px;
         }
         &.cp-usergrid-empty {
@@ -42,17 +43,12 @@
             justify-content: center;
             align-items: center;
             padding: 5px;
-            margin-bottom: 6px;
-            margin-right: 6px;
+            margin: 3px;
             cursor: default;
             transition: order 0.5s, background-color 0.5s;
             margin-top: 1px;
             .tools_unselectable();
 
-            &:nth-child(6n) {
-                margin-right: 0;
-            }
-
             &.cp-selected {
                 background-color: @colortheme_alertify-primary;
                 color: @colortheme_alertify-primary-text;

From 09fdfa2ad2be1d42bb4984eb8e82029c1b496081 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 25 Nov 2019 17:54:22 +0100
Subject: [PATCH 3/4] Fix usergrid UI issues

---
 customize.dist/src/less2/include/modals-ui-elements.less | 1 +
 customize.dist/src/less2/include/usergrid.less           | 7 ++++++-
 www/common/common-ui-elements.js                         | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 57c9b0a53..6e3921781 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -6,6 +6,7 @@
 & {
     // Share modal
     .msg.cp-inline-radio-group {
+        overflow: unset !important;
         .radio-group {
             display: flex;
             flex-direction: row;
diff --git a/customize.dist/src/less2/include/usergrid.less b/customize.dist/src/less2/include/usergrid.less
index 19c3d1d3a..b12ebccaa 100644
--- a/customize.dist/src/less2/include/usergrid.less
+++ b/customize.dist/src/less2/include/usergrid.less
@@ -10,9 +10,13 @@
         .cp-usergrid-grid {
             display: flex;
             flex-wrap: wrap;
-            margin: -3px;
             margin-bottom: 6px;
         }
+        &:not(.large) {
+            .cp-usergrid-grid {
+                margin: -3px;
+            }
+        }
         &.cp-usergrid-empty {
             .cp-usergrid-grid, .cp-usergrid-filter {
                 display: none;
@@ -75,6 +79,7 @@
                 width: 140px;
                 height: 35px;
                 flex-flow: row;
+                margin: 0;
                 margin-right: 15px;
                 margin-bottom: 1px;
                 &:nth-child(3n) {
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 0ef92c048..280849e7f 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -788,7 +788,7 @@ define([
             placeholder: Messages.share_filterFriend
         });
 
-        var div = h('div.cp-usergrid-container' + noOthers, [
+        var div = h('div.cp-usergrid-container' + noOthers + (config.large?'.large':''), [
             label ? h('label', label) : undefined,
             h('div.cp-usergrid-filter', (config.noFilter || config.noSelect) ? undefined : [
                 inputFilter,

From 77ee1b02dc05f3cafebe6938399bf17ef7f4c49d Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 25 Nov 2019 17:58:33 +0100
Subject: [PATCH 4/4] Add missing margin in usergrid

---
 customize.dist/src/less2/include/usergrid.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/customize.dist/src/less2/include/usergrid.less b/customize.dist/src/less2/include/usergrid.less
index b12ebccaa..4ff807638 100644
--- a/customize.dist/src/less2/include/usergrid.less
+++ b/customize.dist/src/less2/include/usergrid.less
@@ -15,6 +15,7 @@
         &:not(.large) {
             .cp-usergrid-grid {
                 margin: -3px;
+                margin-bottom: 6px;
             }
         }
         &.cp-usergrid-empty {