From 612467ed927d76f31ea3bb08c70b4aa9f61538b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <david.benque@xwiki.com>
Date: Mon, 7 Feb 2022 14:59:08 +0000
Subject: [PATCH] Rounded settings page

---
 customize.dist/src/less2/include/contextmenu.less    | 5 ++++-
 customize.dist/src/less2/include/leftside-menu.less  | 3 ++-
 customize.dist/src/less2/include/sidebar-layout.less | 8 ++++++--
 www/settings/inner.js                                | 4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/customize.dist/src/less2/include/contextmenu.less b/customize.dist/src/less2/include/contextmenu.less
index 7767cf9c5..57ca91f30 100644
--- a/customize.dist/src/less2/include/contextmenu.less
+++ b/customize.dist/src/less2/include/contextmenu.less
@@ -17,6 +17,9 @@
                 border-top: 1px solid @cp_context-border;
             }
         }
+        .dropdown-menu {
+            padding: 6px 0px;
+        }
         li {
             padding: 0;
             font-size: @colortheme_app-font-size;
@@ -39,7 +42,7 @@
                     top: -0.7rem;
                     left: 100%;
                     background-color: @cp_context-bg;
-                    border-radius: 0px;
+                    border-radius: @variables_radius;
                     border: 1px solid @cp_context-border;
                 }
             }
diff --git a/customize.dist/src/less2/include/leftside-menu.less b/customize.dist/src/less2/include/leftside-menu.less
index 9ec56f9af..830f63334 100644
--- a/customize.dist/src/less2/include/leftside-menu.less
+++ b/customize.dist/src/less2/include/leftside-menu.less
@@ -5,10 +5,11 @@
 .leftside-menu-category_main() {
     .unselectable_make();
     padding: 5px;
-    margin: 15px 0;
+    margin: 10px 0;
     cursor: pointer;
     height: @variables_bar-height;
     border-radius: @variables_radius;
+    background-color: @cp_sidebar-left-item-bg;
     .fa, .cptools {
         display: inline-flex;
         justify-content: center;
diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index 564067fb7..39f142742 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -24,12 +24,14 @@
             background: @cp_sidebar-left-bg;
             display: flex;
             flex-flow: column;
+            padding: 0px 5px;
             .cp-sidebarlayout-categories {
                 flex: 1;
                 .cp-sidebarlayout-category {
                     display: flex;
                     align-items: center;
                     .leftside-menu-category_main();
+                    box-shadow: 0px 0px 5px 1px #00000030; // XXX
                 }
             }
             &.cp-leftside-narrow {
@@ -111,10 +113,12 @@
                     //border-radius: 0.25em 0 0 0.25em;
                     border: 1px solid @cryptpad_color_grey_500;
                     border-right: 0px;
+                    border-top-right-radius: 0px;
+                    border-bottom-right-radius: 0px;
                 }
                 button {
-                    //border-radius: 0 0.25em 0.25em 0;
-                    //border: 1px solid #adadad;
+                    border-top-left-radius: 0px;
+                    border-bottom-left-radius: 0px;
                     border-left: 0px;
                     height: 40px;
                     margin: 0 !important;
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 183f3acbb..df38e7110 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -1449,7 +1449,7 @@ define([
         $('<label>').text(Messages.settings_codeIndentation).appendTo($div);
 
         var $inputBlock = $('<div>', {
-            'class': 'cp-sidebarlayout-input-block',
+            'class': 'cp-sidebarlayout-input',
         }).appendTo($div);
 
         var $input = $('<input>', {
@@ -1544,7 +1544,7 @@ define([
         $('<label>').text(Messages.settings_codeFontSize).appendTo($div);
 
         var $inputBlock = $('<div>', {
-            'class': 'cp-sidebarlayout-input-block',
+            'class': 'cp-sidebarlayout-input',
         }).appendTo($div);
 
         var $input = $('<input>', {